From 96e56bdd0cbf5d7640fa30984f78c27a084b6d05 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 13 Oct 2019 21:47:26 +1000 Subject: [PATCH 01/16] Rebase translation work for easier rebasing --- buildSrc/build.gradle.kts | 1 + .../bukkit/BukkitBlockCommandSender.java | 9 +- .../bukkit/BukkitCommandInspector.java | 5 +- .../worldedit/bukkit/BukkitCommandSender.java | 8 +- .../sk89q/worldedit/bukkit/BukkitPlayer.java | 10 +- .../bukkit/BukkitServerInterface.java | 6 +- .../sk89q/worldedit/cli/CLICommandSender.java | 8 +- worldedit-core/build.gradle.kts | 32 +++ .../internal/util/RstWorldEditText.kt | 3 +- .../java/com/sk89q/worldedit/WorldEdit.java | 17 +- .../worldedit/command/ApplyBrushCommands.java | 11 +- .../worldedit/command/BiomeCommands.java | 32 ++- .../worldedit/command/BrushCommands.java | 26 ++- .../worldedit/command/ClipboardCommands.java | 31 ++- .../worldedit/command/ExpandCommands.java | 12 +- .../worldedit/command/GeneralCommands.java | 53 +++-- .../worldedit/command/HistoryCommands.java | 16 +- .../worldedit/command/NavigationCommands.java | 29 +-- .../worldedit/command/PaintBrushCommands.java | 13 +- .../worldedit/command/RegionCommands.java | 12 +- .../worldedit/command/SnapshotCommands.java | 26 +-- .../command/SnapshotUtilCommands.java | 29 +-- .../command/SuperPickaxeCommands.java | 12 +- .../sk89q/worldedit/command/ToolCommands.java | 68 +++--- .../worldedit/command/UtilityCommands.java | 60 +++--- .../worldedit/command/WorldEditCommands.java | 58 ++--- .../worldedit/command/tool/AreaPickaxe.java | 3 +- .../command/tool/BlockDataCyler.java | 16 +- .../worldedit/command/tool/BlockReplacer.java | 4 +- .../worldedit/command/tool/BrushTool.java | 5 +- .../worldedit/command/tool/DistanceWand.java | 3 +- .../command/tool/FloatingTreeRemover.java | 7 +- .../worldedit/command/tool/FloodFillTool.java | 3 +- .../command/tool/LongRangeBuildTool.java | 3 +- .../command/tool/NavigationWand.java | 5 +- .../worldedit/command/tool/QueryTool.java | 7 +- .../command/tool/RecursivePickaxe.java | 3 +- .../worldedit/command/tool/SinglePickaxe.java | 3 +- .../worldedit/command/tool/TreePlanter.java | 5 +- .../command/util/AsyncCommandBuilder.java | 7 +- .../command/util/FutureProgressListener.java | 12 ++ .../command/util/MessageTimerTask.java | 9 +- .../worldedit/extension/platform/Actor.java | 43 ++++ .../platform/PlatformCommandManager.java | 18 +- .../extension/platform/PlatformManager.java | 4 - .../extension/platform/PlayerProxy.java | 6 + .../extent/reorder/ChunkBatchingExtent.java | 4 - .../extent/world/FastModeExtent.java | 4 - .../worldedit/function/factory/Deform.java | 12 +- .../function/operation/ChangeSetExecutor.java | 4 - .../function/operation/DelegateOperation.java | 8 +- .../function/operation/ForwardExtentCopy.java | 35 ++-- .../function/operation/Operation.java | 21 +- .../function/operation/OperationQueue.java | 9 +- .../function/operation/SetLocatedBlocks.java | 4 - .../function/visitor/BreadthFirstSearch.java | 27 ++- .../function/visitor/EntityVisitor.java | 14 +- .../function/visitor/FlatRegionVisitor.java | 14 +- .../function/visitor/LayerVisitor.java | 4 - .../function/visitor/RegionVisitor.java | 16 +- .../scripting/CraftScriptContext.java | 9 +- .../util/formatting/WorldEditText.java | 11 +- .../util/formatting/component/MessageBox.java | 11 +- .../util/formatting/component/TextUtils.java | 49 +++++ .../worldedit/util/io/ResourceLoader.java | 13 ++ .../util/paste/ActorCallbackPaste.java | 24 +++ .../util/translation/LocalisationHelpers.java | 42 ++++ .../util/translation/TranslationManager.java | 144 +++++++++++++ .../src/main/resources/lang/.gitignore | 1 + .../src/main/resources/lang/strings.json | 198 ++++++++++++++++++ .../sk89q/worldedit/fabric/FabricPlayer.java | 9 +- .../mixin/AccessorServerPlayerEntity.java | 31 +++ .../fabric/mixin/MixinServerPlayerEntity.java | 1 + .../src/main/resources/worldedit.mixins.json | 3 +- .../sk89q/worldedit/forge/ForgePlayer.java | 8 +- .../resources/META-INF/accesstransformer.cfg | 3 +- .../worldedit/sponge/CommandAdapter.java | 6 +- .../worldedit/sponge/SpongeCommandSender.java | 8 +- .../sk89q/worldedit/sponge/SpongePlayer.java | 8 +- .../worldedit/sponge/SpongeTextAdapter.java | 6 +- 80 files changed, 1155 insertions(+), 359 deletions(-) create mode 100644 worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/TextUtils.java create mode 100644 worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/LocalisationHelpers.java create mode 100644 worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java create mode 100644 worldedit-core/src/main/resources/lang/.gitignore create mode 100644 worldedit-core/src/main/resources/lang/strings.json create mode 100644 worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerEntity.java diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 1d3389b09..6fc1cec83 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -53,4 +53,5 @@ dependencies { implementation("net.minecraftforge.gradle:ForgeGradle:3.0.143") implementation("net.fabricmc:fabric-loom:$loomVersion") implementation("net.fabricmc:sponge-mixin:$mixinVersion") + implementation("gradle.plugin.com.mendhak.gradlecrowdin:plugin:0.1.0") } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java index fe5114cb1..e5545a804 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java @@ -32,9 +32,11 @@ import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.util.formatting.text.adapter.bukkit.TextAdapter; import com.sk89q.worldedit.util.formatting.text.format.TextColor; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.command.BlockCommandSender; +import java.util.Locale; import java.util.UUID; import javax.annotation.Nullable; @@ -91,7 +93,12 @@ public class BukkitBlockCommandSender extends AbstractNonPlayerActor implements @Override public void print(Component component) { - TextAdapter.sendComponent(sender, WorldEditText.format(component)); + TextAdapter.sendComponent(sender, WorldEditText.format(component, getLocale())); + } + + @Override + public Locale getLocale() { + return Locale.US; } @Override diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java index de2a5ffa1..a314b4855 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java @@ -30,6 +30,7 @@ import org.enginehub.piston.inject.MapBackedValueStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Locale; import java.util.Optional; import static com.google.common.base.Preconditions.checkNotNull; @@ -52,7 +53,7 @@ class BukkitCommandInspector implements CommandInspector { public String getShortText(Command command) { Optional mapping = dispatcher.getCommand(command.getName()); if (mapping.isPresent()) { - return reduceToText(mapping.get().getDescription()); + return reduceToText(mapping.get().getDescription(), Locale.US); } else { logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'"); return "Help text not available"; @@ -63,7 +64,7 @@ class BukkitCommandInspector implements CommandInspector { public String getFullText(Command command) { Optional mapping = dispatcher.getCommand(command.getName()); if (mapping.isPresent()) { - return reduceToText(mapping.get().getFullHelp()); + return reduceToText(mapping.get().getFullHelp(), Locale.US); } else { logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'"); return "Help text not available"; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java index 75d5aa903..33dc3594c 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java @@ -31,6 +31,7 @@ import com.sk89q.worldedit.util.formatting.text.adapter.bukkit.TextAdapter; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.Locale; import java.util.UUID; import javax.annotation.Nullable; @@ -94,7 +95,7 @@ public class BukkitCommandSender extends AbstractNonPlayerActor { @Override public void print(Component component) { - TextAdapter.sendComponent(sender, WorldEditText.format(component)); + TextAdapter.sendComponent(sender, WorldEditText.format(component, getLocale())); } @Override @@ -111,6 +112,11 @@ public class BukkitCommandSender extends AbstractNonPlayerActor { public void checkPermission(String permission) throws AuthorizationException { } + @Override + public Locale getLocale() { + return Locale.US; + } + @Override public SessionKey getSessionKey() { return new SessionKey() { diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java index 75b9c0ff7..7abaf32be 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java @@ -20,6 +20,7 @@ package com.sk89q.worldedit.bukkit; import com.sk89q.util.StringUtil; +import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter; @@ -33,13 +34,13 @@ import com.sk89q.worldedit.session.SessionKey; import com.sk89q.worldedit.util.HandSide; import com.sk89q.worldedit.util.formatting.WorldEditText; import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.adapter.bukkit.TextAdapter; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.gamemode.GameMode; import com.sk89q.worldedit.world.gamemode.GameModes; -import com.sk89q.worldedit.util.formatting.text.adapter.bukkit.TextAdapter; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -130,7 +131,7 @@ public class BukkitPlayer extends AbstractPlayerActor { @Override public void print(Component component) { - TextAdapter.sendComponent(player, WorldEditText.format(component)); + TextAdapter.sendComponent(player, WorldEditText.format(component, getLocale())); } @Override @@ -216,6 +217,11 @@ public class BukkitPlayer extends AbstractPlayerActor { return player.teleport(BukkitAdapter.adapt(location)); } + @Override + public Locale getLocale() { + return Locale.forLanguageTag(player.getLocale().replace('_', '-')); + } + @Nullable @Override public T getFacet(Class cls) { diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java index 0fda56974..5a9ca9b93 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java @@ -43,6 +43,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.EnumMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -168,8 +169,9 @@ public class BukkitServerInterface implements MultiUserPlatform { Stream.of(command.getName()), command.getAliases().stream() ).toArray(String[]::new); - return new CommandInfo(reduceToText(command.getUsage()), - reduceToText(command.getDescription()), aliases, + // TODO Handle localisation correctly + return new CommandInfo(reduceToText(command.getUsage(), Locale.US), + reduceToText(command.getDescription(), Locale.US), aliases, inspector, permissionsArray); }).collect(Collectors.toList())); } diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java index 970c11df5..2170cf17c 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java @@ -32,6 +32,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 +98,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 +139,11 @@ public class CLICommandSender implements Actor { public void dispatchCUIEvent(CUIEvent event) { } + @Override + public Locale getLocale() { + return Locale.getDefault(); + } + @Override public SessionKey getSessionKey() { return new SessionKey() { diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index 188dc7430..e03d384fb 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -1,11 +1,14 @@ import net.minecrell.gradle.licenser.LicenseExtension import org.gradle.plugins.ide.idea.model.IdeaModel +import com.mendhak.gradlecrowdin.DownloadTranslationsTask +import com.mendhak.gradlecrowdin.UploadSourceFileTask plugins { id("java-library") id("net.ltgt.apt-eclipse") id("net.ltgt.apt-idea") id("antlr") + id("com.mendhak.gradlecrowdin") } applyPlatformAndCoreConfiguration() @@ -84,3 +87,32 @@ sourceSets { } } } + +val crowdinApiKey = "crowdin_apikey" + +fun Project.applyPlatformCrowdInConfig() { + if (!project.hasProperty(crowdinApiKey)) ext[crowdinApiKey] = "" + + apply(plugin = "com.mendhak.gradlecrowdin") + + tasks.named("crowdinUpload") { + apiKey = crowdinApiKey + projectId = "worldedit-core" + files = arrayOf( + object { + var name = "strings.json" + var source = "$projectDir/src/main/resources/lang/strings.json" + } + ) + } + + tasks.named("crowdinDownload") { + apiKey = crowdinApiKey + destination = "$projectDir/src/main/resources/lang" + projectId = "worldedit-core" + } + + tasks.named("processResources").configure { + dependsOn("crowdinDownload") + } +} diff --git a/worldedit-core/doctools/src/main/kotlin/com/sk89q/worldedit/internal/util/RstWorldEditText.kt b/worldedit-core/doctools/src/main/kotlin/com/sk89q/worldedit/internal/util/RstWorldEditText.kt index 2b37700f6..04adb822e 100644 --- a/worldedit-core/doctools/src/main/kotlin/com/sk89q/worldedit/internal/util/RstWorldEditText.kt +++ b/worldedit-core/doctools/src/main/kotlin/com/sk89q/worldedit/internal/util/RstWorldEditText.kt @@ -7,9 +7,10 @@ import com.sk89q.worldedit.util.formatting.text.TranslatableComponent import com.sk89q.worldedit.util.formatting.text.event.ClickEvent import com.sk89q.worldedit.util.formatting.text.format.TextDecoration import org.enginehub.piston.util.TextHelper +import java.util.Locale fun reduceToRst(component: Component): String { - val formatted = WorldEditText.format(component) + val formatted = WorldEditText.format(component, Locale.US) return formatAsRst(formatted).toString() } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java b/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java index fade284c4..7c65784d2 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java @@ -48,12 +48,14 @@ import com.sk89q.worldedit.util.Direction; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.concurrency.EvenMoreExecutors; import com.sk89q.worldedit.util.eventbus.EventBus; +import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.util.io.file.FileSelectionAbortedException; import com.sk89q.worldedit.util.io.file.FilenameException; import com.sk89q.worldedit.util.io.file.FilenameResolutionException; import com.sk89q.worldedit.util.io.file.InvalidFilenameException; import com.sk89q.worldedit.util.task.SimpleSupervisor; import com.sk89q.worldedit.util.task.Supervisor; +import com.sk89q.worldedit.util.translation.TranslationManager; import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.registry.BundledBlockData; @@ -64,6 +66,7 @@ import org.slf4j.LoggerFactory; import javax.annotation.Nullable; import javax.script.ScriptException; + import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; @@ -108,6 +111,7 @@ public final class WorldEdit { private final ListeningExecutorService executorService = MoreExecutors.listeningDecorator( EvenMoreExecutors.newBoundedCachedThreadPool(0, 1, 20, "WorldEdit Task Executor - %s")); private final Supervisor supervisor = new SimpleSupervisor(); + private final TranslationManager translationManager = new TranslationManager(this); private final BlockFactory blockFactory = new BlockFactory(this); private final ItemFactory itemFactory = new ItemFactory(this); @@ -223,6 +227,15 @@ public final class WorldEdit { return sessions; } + /** + * Return the translation manager. + * + * @return the translation manager + */ + public TranslationManager getTranslationManager() { + return translationManager; + } + /** * Gets the path to a file. This method will check to see if the filename * has valid characters and has an extension. It also prevents directory @@ -684,13 +697,13 @@ public final class WorldEdit { engine.evaluate(script, filename, vars); } catch (ScriptException e) { player.printError("Failed to execute:"); - player.printRaw(e.getMessage()); + player.print(TextComponent.of(e.getMessage())); logger.warn("Failed to execute script", e); } catch (NumberFormatException | WorldEditException e) { throw e; } catch (Throwable e) { player.printError("Failed to execute (see console):"); - player.printRaw(e.getClass().getCanonicalName()); + player.print(TextComponent.of(e.getClass().getCanonicalName())); logger.warn("Failed to execute script", e); } finally { for (EditSession editSession : scriptContext.getEditSessions()) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java index 67bb630bd..9715ae8d1 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java @@ -61,19 +61,19 @@ import static org.enginehub.piston.part.CommandParts.arg; @CommandContainer(superTypes = CommandPermissionsConditionGenerator.Registration.class) public class ApplyBrushCommands { - private static final CommandArgument REGION_FACTORY = arg(TranslatableComponent.of("shape"), TextComponent.of("The shape of the region")) + private static final CommandArgument REGION_FACTORY = arg(TranslatableComponent.of("shape"), TranslatableComponent.of("worldedit.brush.apply.shape")) .defaultsTo(ImmutableList.of()) .ofTypes(ImmutableList.of(Key.of(RegionFactory.class))) .build(); - private static final CommandArgument RADIUS = arg(TranslatableComponent.of("radius"), TextComponent.of("The size of the brush")) + private static final CommandArgument RADIUS = arg(TranslatableComponent.of("radius"), TranslatableComponent.of("worldedit.brush.apply.radius")) .defaultsTo(ImmutableList.of("5")) .ofTypes(ImmutableList.of(Key.of(double.class))) .build(); public static void register(CommandManagerService service, CommandManager commandManager, CommandRegistrationHandler registration) { commandManager.register("apply", builder -> { - builder.description(TextComponent.of("Apply brush, apply a function to every block")); + builder.description(TranslatableComponent.of("worldedit.brush.apply.description")); builder.action(org.enginehub.piston.Command.Action.NULL_ACTION); CommandManager manager = service.newCommandManager(); @@ -86,7 +86,7 @@ public class ApplyBrushCommands { builder.condition(new PermissionCondition(ImmutableSet.of("worldedit.brush.apply"))); builder.addParts(REGION_FACTORY, RADIUS); - builder.addPart(SubCommandPart.builder(TranslatableComponent.of("type"), TextComponent.of("Type of brush to use")) + builder.addPart(SubCommandPart.builder(TranslatableComponent.of("type"), TranslatableComponent.of("worldedit.brush.apply.type")) .withCommands(manager.getAllCommands().collect(Collectors.toList())) .required() .build()); @@ -125,8 +125,7 @@ public class ApplyBrushCommands { @Direction(includeDiagonals = true) com.sk89q.worldedit.util.Direction direction) throws WorldEditException { player.print(TextComponent.builder().append("WARNING: ", TextColor.RED, TextDecoration.BOLD) - .append("This brush simulates item usages. Its effects may not work on all platforms, may not be undo-able," + - " and may cause strange interactions with other mods/plugins. Use at your own risk.").build()); + .append(TranslatableComponent.of("worldedit.brush.apply.item.warning")).build()); setApplyBrush(parameters, player, localSession, new ItemUseFactory(item, direction)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java index 29747852e..9b40db6a8 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java @@ -45,6 +45,11 @@ import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Regions; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.formatting.component.PaginationBox; +import com.sk89q.worldedit.util.formatting.component.TextUtils; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.event.HoverEvent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.biome.BiomeData; import com.sk89q.worldedit.world.biome.BiomeType; @@ -56,10 +61,12 @@ import org.enginehub.piston.annotation.param.ArgFlag; import org.enginehub.piston.annotation.param.Switch; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; import static com.sk89q.worldedit.command.util.Logging.LogMode.REGION; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Implements biome-related commands such as "/biomelist". @@ -117,24 +124,24 @@ public class BiomeCommands { BiomeRegistry biomeRegistry = WorldEdit.getInstance().getPlatformManager() .queryCapability(Capability.GAME_HOOKS).getRegistries().getBiomeRegistry(); Set biomes = new HashSet<>(); - String qualifier; + String messageKey; if (useLineOfSight) { Location blockPosition = player.getBlockTrace(300); if (blockPosition == null) { - player.printError("No block in sight!"); + player.printError(TranslatableComponent.of("worldedit.raytrace.noblock")); return; } BiomeType biome = player.getWorld().getBiome(blockPosition.toVector().toBlockPoint().toBlockVector2()); biomes.add(biome); - qualifier = "at line of sight point"; + messageKey = "worldedit.biomeinfo.lineofsight"; } else if (usePosition) { BiomeType biome = player.getWorld().getBiome(player.getLocation().toVector().toBlockPoint().toBlockVector2()); biomes.add(biome); - qualifier = "at your position"; + messageKey = "worldedit.biomeinfo.position"; } else { World world = player.getWorld(); Region region = session.getSelection(world); @@ -149,18 +156,18 @@ public class BiomeCommands { } } - qualifier = "in your selection"; + messageKey = "worldedit.biomeinfo.selection"; } - player.print(biomes.size() != 1 ? "Biomes " + qualifier + ":" : "Biome " + qualifier + ":"); - for (BiomeType biome : biomes) { + List components = biomes.stream().map(biome -> { BiomeData data = biomeRegistry.getData(biome); if (data != null) { - player.print(" " + data.getName()); + return TextComponent.of(data.getName()).hoverEvent(HoverEvent.showText(TextComponent.of(biome.getId()))); } else { - player.print(" "); + return TextComponent.of(biome.getId()); } - } + }).collect(Collectors.toList()); + player.printInfo(TranslatableComponent.of(pluraliseI18n(messageKey, biomes.size()), TextUtils.join(components, TextComponent.of(", ")))); } @Command( @@ -193,7 +200,10 @@ public class BiomeCommands { FlatRegionVisitor visitor = new FlatRegionVisitor(Regions.asFlatRegion(region), replace); Operations.completeLegacy(visitor); - player.print("Biomes were changed in " + visitor.getAffected() + " columns. You may have to rejoin your game (or close and reopen your world) to see a change."); + player.printInfo(TranslatableComponent.of( + pluraliseI18n("worldedit.setbiome.changed", visitor.getAffected()), + TextComponent.of(visitor.getAffected()) + )); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java index e15159af6..5f716484a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java @@ -55,6 +55,8 @@ import com.sk89q.worldedit.session.ClipboardHolder; import com.sk89q.worldedit.session.request.RequestExtent; import com.sk89q.worldedit.util.HandSide; import com.sk89q.worldedit.util.TreeGenerator; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.block.BlockTypes; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; @@ -88,7 +90,7 @@ public class BrushCommands { desc = "Unbind a bound brush from your current item" ) void none(Player player, LocalSession session) throws WorldEditException { - ToolCommands.setToolNone(player, session, "Brush"); + ToolCommands.setToolNone(player, session, true); } @Command( @@ -116,7 +118,7 @@ public class BrushCommands { tool.setBrush(new SphereBrush(), "worldedit.brush.sphere"); } - player.print(String.format("Sphere brush shape equipped (%.0f).", radius)); + player.printInfo(TranslatableComponent.of("worldedit.brush.sphere.equip", TextComponent.of((int) radius))); } @Command( @@ -147,7 +149,7 @@ public class BrushCommands { tool.setBrush(new CylinderBrush(height), "worldedit.brush.cylinder"); } - player.print(String.format("Cylinder brush shape equipped (%.0f by %d).", radius, height)); + player.printInfo(TranslatableComponent.of("worldedit.brush.cylinder.equip", TextComponent.of((int) radius), TextComponent.of(height))); } @Command( @@ -183,7 +185,7 @@ public class BrushCommands { BrushTool tool = session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()); tool.setBrush(new ClipboardBrush(newHolder, ignoreAir, usingOrigin, pasteEntities, pasteBiomes, sourceMask), "worldedit.brush.clipboard"); - player.print("Clipboard brush shape equipped."); + player.printInfo(TranslatableComponent.of("worldedit.brush.clipboard.equip")); } @Command( @@ -205,7 +207,12 @@ public class BrushCommands { tool.setSize(radius); tool.setBrush(new SmoothBrush(iterations, mask), "worldedit.brush.smooth"); - player.print(String.format("Smooth brush equipped (%.0f x %dx, using %s).", radius, iterations, mask == null ? "any block" : "filter")); + player.printInfo(TranslatableComponent.of( + "worldedit.brush.smooth.equip", + TextComponent.of((int) radius), + TextComponent.of(iterations), + TextComponent.of(mask == null ? "any block" : "filter") + )); } @Command( @@ -225,7 +232,7 @@ public class BrushCommands { tool.setMask(new BlockTypeMask(new RequestExtent(), BlockTypes.FIRE)); tool.setBrush(new SphereBrush(), "worldedit.brush.ex"); - player.print(String.format("Extinguisher equipped (%.0f).", radius)); + player.printInfo(TranslatableComponent.of("worldedit.brush.extinguish.equip", TextComponent.of((int) radius))); } @Command( @@ -245,8 +252,7 @@ public class BrushCommands { tool.setSize(radius); tool.setBrush(new GravityBrush(fromMaxY), "worldedit.brush.gravity"); - player.print(String.format("Gravity brush equipped (%.0f).", - radius)); + player.printInfo(TranslatableComponent.of("worldedit.brush.gravity.equip", TextComponent.of((int) radius))); } @Command( @@ -302,7 +308,7 @@ public class BrushCommands { tool.setSize(radius); tool.setBrush(new ButcherBrush(flags), "worldedit.brush.butcher"); - player.print(String.format("Butcher brush equipped (%.0f).", radius)); + player.printInfo(TranslatableComponent.of("worldedit.brush.butcher.equip", TextComponent.of((int) radius))); } @Command( @@ -404,6 +410,6 @@ public class BrushCommands { tool.setFill(null); tool.setBrush(new OperationFactoryBrush(factory, shape, session), permission); - player.print("Set brush to " + factory); + player.printInfo(TranslatableComponent.of("worldedit.brush.operation.equip", TextComponent.of(factory.toString()))); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java index b90fe7786..848ec49c0 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java @@ -45,18 +45,21 @@ import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.selector.CuboidRegionSelector; import com.sk89q.worldedit.session.ClipboardHolder; +import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.world.World; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; import org.enginehub.piston.annotation.param.Arg; import org.enginehub.piston.annotation.param.ArgFlag; import org.enginehub.piston.annotation.param.Switch; -import java.util.List; - import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT; import static com.sk89q.worldedit.command.util.Logging.LogMode.REGION; +import java.util.List; + /** * Clipboard commands. */ @@ -87,9 +90,7 @@ public class ClipboardCommands { Operations.completeLegacy(copy); session.setClipboard(new ClipboardHolder(clipboard)); - List messages = Lists.newArrayList(); - copy.addStatusMessages(messages); - messages.forEach(actor::print); + copy.getStatusMessages().forEach(actor::print); } @Command( @@ -122,9 +123,7 @@ public class ClipboardCommands { Operations.completeLegacy(copy); session.setClipboard(new ClipboardHolder(clipboard)); - List messages = Lists.newArrayList(); - copy.addStatusMessages(messages); - messages.forEach(actor::print); + copy.getStatusMessages().forEach(actor::print); } @Command( @@ -153,7 +152,7 @@ public class ClipboardCommands { ClipboardHolder holder = session.getClipboard(); Clipboard clipboard = holder.getClipboard(); Region region = clipboard.getRegion(); - List messages = Lists.newArrayList(); + List messages = Lists.newArrayList(); BlockVector3 to = atOrigin ? clipboard.getOrigin() : session.getPlacementPosition(actor); if (!onlySelect) { @@ -166,7 +165,7 @@ public class ClipboardCommands { .maskSource(sourceMask) .build(); Operations.completeLegacy(operation); - operation.addStatusMessages(messages); + messages.addAll(Lists.newArrayList(operation.getStatusMessages())); } if (selectPasted || onlySelect) { @@ -180,9 +179,9 @@ public class ClipboardCommands { } if (onlySelect) { - actor.print("Selected clipboard paste region."); + actor.printInfo(TranslatableComponent.of("worldedit.paste.selected")); } else { - actor.print("The clipboard has been pasted at " + to); + actor.printInfo(TranslatableComponent.of("worldedit.paste.pasted", TextComponent.of(to.toString()))); } messages.forEach(actor::print); } @@ -205,7 +204,7 @@ public class ClipboardCommands { if (Math.abs(yRotate % 90) > 0.001 || Math.abs(xRotate % 90) > 0.001 || Math.abs(zRotate % 90) > 0.001) { - actor.printDebug("Note: Interpolation is not yet supported, so angles that are multiples of 90 is recommended."); + actor.printDebug(TranslatableComponent.of("worldedit.rotate.no-interpolation")); } ClipboardHolder holder = session.getClipboard(); @@ -214,7 +213,7 @@ public class ClipboardCommands { transform = transform.rotateX(-xRotate); transform = transform.rotateZ(-zRotate); holder.setTransform(holder.getTransform().combine(transform)); - actor.print("The clipboard copy has been rotated."); + actor.printInfo(TranslatableComponent.of("worldedit.rotate.rotated")); } @Command( @@ -229,7 +228,7 @@ public class ClipboardCommands { AffineTransform transform = new AffineTransform(); transform = transform.scale(direction.abs().multiply(-2).add(1, 1, 1).toVector3()); holder.setTransform(holder.getTransform().combine(transform)); - actor.print("The clipboard copy has been flipped."); + actor.printInfo(TranslatableComponent.of("worldedit.flip.flipped")); } @Command( @@ -239,6 +238,6 @@ public class ClipboardCommands { @CommandPermissions("worldedit.clipboard.clear") public void clearClipboard(Actor actor, LocalSession session) throws WorldEditException { session.setClipboard(null); - actor.print("Clipboard cleared."); + actor.printInfo(TranslatableComponent.of("worldedit.clearclipboard.cleared")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java index 748c7e3c5..b9a8a3093 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java @@ -48,6 +48,7 @@ import java.util.List; import static com.sk89q.worldedit.command.util.Logging.LogMode.REGION; import static com.sk89q.worldedit.internal.command.CommandUtil.requireIV; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Extracted from {@link SelectionCommands} to allow importing of {@link Command}. @@ -89,7 +90,7 @@ public class ExpandCommands { private static Command createVertCommand(CommandManager commandManager) { return commandManager.newCommand("vert") - .description(TextComponent.of("Vertically expand the selection to world limits.")) + .description(TranslatableComponent.of("worldedit.expand.description.vert")) .action(parameters -> { expandVert( requireIV(Key.of(LocalSession.class), "localSession", parameters), @@ -110,8 +111,10 @@ public class ExpandCommands { session.getRegionSelector(player.getWorld()).learnChanges(); int newSize = region.getArea(); session.getRegionSelector(player.getWorld()).explainRegionAdjust(player, session); - player.print("Region expanded " + (newSize - oldSize) - + " blocks [top-to-bottom]."); + int changeSize = newSize - oldSize; + player.printInfo( + TranslatableComponent.of(pluraliseI18n("worldedit.expand.expanded.vert", changeSize), TextComponent.of(changeSize)) + ); } catch (RegionOperationException e) { player.printError(e.getMessage()); } @@ -148,7 +151,8 @@ public class ExpandCommands { session.getRegionSelector(world).explainRegionAdjust(actor, session); - actor.print("Region expanded " + (newSize - oldSize) + " block(s)."); + int changeSize = newSize - oldSize; + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.expand.expanded", changeSize), TextComponent.of(changeSize))); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java index 495b43663..80639abd3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java @@ -19,6 +19,8 @@ package com.sk89q.worldedit.command; +import static com.google.common.base.Preconditions.checkNotNull; + import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.LocalConfiguration; import com.sk89q.worldedit.LocalSession; @@ -36,6 +38,9 @@ import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.util.formatting.component.PaginationBox; import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.world.World; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; import com.sk89q.worldedit.world.item.ItemType; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; @@ -50,8 +55,6 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.Callable; -import static com.google.common.base.Preconditions.checkNotNull; - /** * General WorldEdit commands. */ @@ -85,14 +88,17 @@ public class GeneralCommands { limit = limit == null ? config.defaultChangeLimit : Math.max(-1, limit); if (!mayDisable && config.maxChangeLimit > -1) { if (limit > config.maxChangeLimit) { - actor.printError("Your maximum allowable limit is " + config.maxChangeLimit + "."); + actor.printError(TranslatableComponent.of("worldedit.limit.too-high", TextComponent.of(config.maxChangeLimit))); return; } } session.setBlockChangeLimit(limit); - actor.print("Block change limit set to " + limit + "." - + (limit == config.defaultChangeLimit ? "" : " (Use //limit to go back to the default.)")); + Component component = TextComponent.empty().append(TranslatableComponent.of("worldedit.limit.set", TextComponent.of(limit))); + if (limit != config.defaultChangeLimit) { + component.append(TranslatableComponent.of("worldedit.limit.return-to-default", TextColor.GRAY)); + } + actor.printInfo(component); } @Command( @@ -109,14 +115,17 @@ public class GeneralCommands { limit = limit == null ? config.calculationTimeout : Math.max(-1, limit); if (!mayDisable && config.maxCalculationTimeout > -1) { if (limit > config.maxCalculationTimeout) { - actor.printError("Your maximum allowable timeout is " + config.maxCalculationTimeout + " ms."); + actor.printError(TranslatableComponent.of("worldedit.timeout.too-high", TextComponent.of(config.maxCalculationTimeout))); return; } } session.setTimeout(limit); - actor.print("Timeout time set to " + limit + " ms." - + (limit == config.calculationTimeout ? "" : " (Use //timeout to go back to the default.)")); + Component component = TextComponent.empty().append(TranslatableComponent.of("worldedit.timeout.set", TextComponent.of(limit))); + if (limit != config.calculationTimeout) { + component.append(TranslatableComponent.of("worldedit.timeout.return-to-default", TextColor.GRAY)); + } + actor.printInfo(component); } @Command( @@ -129,16 +138,16 @@ public class GeneralCommands { Boolean fastMode) { boolean hasFastMode = session.hasFastMode(); if (fastMode != null && fastMode == hasFastMode) { - actor.printError("Fast mode already " + (fastMode ? "enabled" : "disabled") + "."); + actor.printError(TranslatableComponent.of(fastMode ? "worldedit.fast.enabled.already" : "worldedit.fast.disabled.already")); return; } if (hasFastMode) { session.setFastMode(false); - actor.print("Fast mode disabled."); + actor.printInfo(TranslatableComponent.of("worldedit.fast.disabled")); } else { session.setFastMode(true); - actor.print("Fast mode enabled. Lighting in the affected chunks may be wrong and/or you may need to rejoin to see changes."); + actor.printInfo(TranslatableComponent.of("worldedit.fast.enabled")); } } @@ -151,10 +160,10 @@ public class GeneralCommands { @Arg(desc = "The reorder mode", def = "") EditSession.ReorderMode reorderMode) { if (reorderMode == null) { - actor.print("The reorder mode is " + session.getReorderMode().getDisplayName()); + actor.printInfo(TranslatableComponent.of("worldedit.reorder.current", TextComponent.of(session.getReorderMode().getDisplayName()))); } else { session.setReorderMode(reorderMode); - actor.print("The reorder mode is now " + session.getReorderMode().getDisplayName()); + actor.printInfo(TranslatableComponent.of("worldedit.reorder.set", TextComponent.of(session.getReorderMode().getDisplayName()))); } } @@ -171,17 +180,17 @@ public class GeneralCommands { } boolean useServerCui = session.shouldUseServerCUI(); if (drawSelection != null && drawSelection == useServerCui) { - player.printError("Server CUI already " + (useServerCui ? "enabled" : "disabled") + "."); + player.printError(TranslatableComponent.of(useServerCui ? "worldedit.drawsel.enabled.already" : "worldedit.drawsel.disabled.already")); return; } if (useServerCui) { session.setUseServerCUI(false); session.updateServerCUI(player); - player.print("Server CUI disabled."); + player.printInfo(TranslatableComponent.of("worldedit.drawsel.disabled")); } else { session.setUseServerCUI(true); session.updateServerCUI(player); - player.print("Server CUI enabled. This only supports cuboid regions, with a maximum size of 32x32x32."); + player.printInfo(TranslatableComponent.of("worldedit.drawsel.enabled")); } } @@ -234,10 +243,10 @@ public class GeneralCommands { Mask mask) { if (mask == null) { session.setMask(null); - actor.print("Global mask disabled."); + actor.printInfo(TranslatableComponent.of("worldedit.gmask.disabled")); } else { session.setMask(mask); - actor.print("Global mask set."); + actor.printInfo(TranslatableComponent.of("worldedit.gmask.set")); } } @@ -248,9 +257,9 @@ public class GeneralCommands { ) public void togglePlace(Player player, LocalSession session) { if (session.togglePlacementPosition()) { - player.print("Now placing at pos #1."); + player.printInfo(TranslatableComponent.of("worldedit.toggleplace.pos1")); } else { - player.print("Now placing at the block you stand in."); + player.printInfo(TranslatableComponent.of("worldedit.toggleplace.player")); } } @@ -271,11 +280,11 @@ public class GeneralCommands { List query) { String search = String.join(" ", query); if (search.length() <= 2) { - actor.printError("Enter a longer search string (len > 2)."); + actor.printError(TranslatableComponent.of("worldedit.searchitem.too-short")); return; } if (blocksOnly && itemsOnly) { - actor.printError("You cannot use both the 'b' and 'i' flags simultaneously."); + actor.printError(TranslatableComponent.of("worldedit.searchitem.b-and-i")); return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java index d5adc0c59..1be270a60 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java @@ -27,6 +27,8 @@ import com.sk89q.worldedit.command.util.CommandPermissions; import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.extension.platform.Actor; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; import org.enginehub.piston.annotation.param.Arg; @@ -68,7 +70,7 @@ public class HistoryCommands { player.checkPermission("worldedit.history.undo.other"); undoSession = worldEdit.getSessionManager().findByName(playerName); if (undoSession == null) { - player.printError("Unable to find session for " + playerName); + player.printError(TranslatableComponent.of("worldedit.session.cant-find-session", TextComponent.of(playerName))); return; } } @@ -83,9 +85,9 @@ public class HistoryCommands { } } if (timesUndone > 0) { - player.print("Undid " + timesUndone + " available edits."); + player.printInfo(TranslatableComponent.of("worldedit.undo.undone", TextComponent.of(timesUndone))); } else { - player.printError("Nothing left to undo."); + player.printError(TranslatableComponent.of("worldedit.undo.none")); } } @@ -106,7 +108,7 @@ public class HistoryCommands { player.checkPermission("worldedit.history.redo.other"); redoSession = worldEdit.getSessionManager().findByName(playerName); if (redoSession == null) { - player.printError("Unable to find session for " + playerName); + player.printError(TranslatableComponent.of("worldedit.session.cant-find-session", TextComponent.of(playerName))); return; } } @@ -121,9 +123,9 @@ public class HistoryCommands { } } if (timesRedone > 0) { - player.print("Redid " + timesRedone + " available edits."); + player.printInfo(TranslatableComponent.of("worldedit.redo.redid", TextComponent.of(timesRedone))); } else { - player.printError("Nothing left to redo."); + player.printError(TranslatableComponent.of("worldedit.redo.none")); } } @@ -135,7 +137,7 @@ public class HistoryCommands { @CommandPermissions("worldedit.history.clear") public void clearHistory(Actor actor, LocalSession session) { session.clearHistory(); - actor.print("History cleared."); + actor.printInfo(TranslatableComponent.of("worldedit.clearhistory.cleared")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java index 0b70e0bd7..e168389b9 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java @@ -27,6 +27,8 @@ import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator; import com.sk89q.worldedit.command.util.Logging; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; import org.enginehub.piston.annotation.param.Arg; @@ -34,6 +36,7 @@ import org.enginehub.piston.annotation.param.Switch; import static com.google.common.base.Preconditions.checkNotNull; import static com.sk89q.worldedit.command.util.Logging.LogMode.POSITION; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Commands for moving the player around. @@ -61,7 +64,7 @@ public class NavigationCommands { @CommandPermissions("worldedit.navigation.unstuck") public void unstuck(Player player) throws WorldEditException { player.findFreePosition(); - player.print("There you go!"); + player.printInfo(TranslatableComponent.of("worldedit.unstuck.moved")); } @Command( @@ -81,9 +84,9 @@ public class NavigationCommands { } } if (ascentLevels == 0) { - player.printError("No free spot above you found."); + player.printError(TranslatableComponent.of("worldedit.ascend.obstructed")); } else { - player.print((ascentLevels != 1) ? "Ascended " + ascentLevels + " levels." : "Ascended a level."); + player.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.ascend.moved", ascentLevels), TextComponent.of(ascentLevels))); } } @@ -104,9 +107,9 @@ public class NavigationCommands { } } if (descentLevels == 0) { - player.printError("No free spot below you found."); + player.printError(TranslatableComponent.of("worldedit.descend.obstructed")); } else { - player.print((descentLevels != 1) ? "Descended " + descentLevels + " levels." : "Descended a level."); + player.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.descend.moved", descentLevels), TextComponent.of(descentLevels))); } } @@ -127,9 +130,9 @@ public class NavigationCommands { boolean alwaysGlass = getAlwaysGlass(forceFlight, forceGlass); if (player.ascendToCeiling(clearance, alwaysGlass)) { - player.print("Whoosh!"); + player.printInfo(TranslatableComponent.of("worldedit.ceil.moved")); } else { - player.printError("No free spot above you found."); + player.printError(TranslatableComponent.of("worldedit.ceil.obstructed")); } } @@ -140,9 +143,9 @@ public class NavigationCommands { @CommandPermissions("worldedit.navigation.thru.command") public void thru(Player player) throws WorldEditException { if (player.passThroughForwardWall(6)) { - player.print("Whoosh!"); + player.printInfo(TranslatableComponent.of("worldedit.thru.moved")); } else { - player.printError("No free spot ahead of you found."); + player.printError(TranslatableComponent.of("worldedit.thru.obstructed")); } } @@ -157,9 +160,9 @@ public class NavigationCommands { Location pos = player.getSolidBlockTrace(300); if (pos != null) { player.findFreePosition(pos); - player.print("Poof!"); + player.printInfo(TranslatableComponent.of("worldedit.jumpto.moved")); } else { - player.printError("No block in sight!"); + player.printError(TranslatableComponent.of("worldedit.jumpto.none")); } } @@ -178,9 +181,9 @@ public class NavigationCommands { boolean forceGlass) throws WorldEditException { boolean alwaysGlass = getAlwaysGlass(forceFlight, forceGlass); if (player.ascendUpwards(distance, alwaysGlass)) { - player.print("Whoosh!"); + player.printInfo(TranslatableComponent.of("worldedit.up.moved")); } else { - player.printError("You would hit something above you."); + player.printError(TranslatableComponent.of("worldedit.up.obstructed")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/PaintBrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/PaintBrushCommands.java index ea929ec49..964d1ae65 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/PaintBrushCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/PaintBrushCommands.java @@ -61,24 +61,24 @@ import static org.enginehub.piston.part.CommandParts.arg; @CommandContainer(superTypes = CommandPermissionsConditionGenerator.Registration.class) public class PaintBrushCommands { - private static final CommandArgument REGION_FACTORY = arg(TranslatableComponent.of("shape"), TextComponent.of("The shape of the region")) + private static final CommandArgument REGION_FACTORY = arg(TranslatableComponent.of("shape"), TranslatableComponent.of("worldedit.brush.paint.shape")) .defaultsTo(ImmutableList.of()) .ofTypes(ImmutableList.of(Key.of(RegionFactory.class))) .build(); - private static final CommandArgument RADIUS = arg(TranslatableComponent.of("radius"), TextComponent.of("The size of the brush")) + private static final CommandArgument RADIUS = arg(TranslatableComponent.of("radius"), TranslatableComponent.of("worldedit.brush.paint.size")) .defaultsTo(ImmutableList.of("5")) .ofTypes(ImmutableList.of(Key.of(double.class))) .build(); - private static final CommandArgument DENSITY = arg(TranslatableComponent.of("density"), TextComponent.of("The density of the brush")) + private static final CommandArgument DENSITY = arg(TranslatableComponent.of("density"), TranslatableComponent.of("worldedit.brush.paint.density")) .defaultsTo(ImmutableList.of("20")) .ofTypes(ImmutableList.of(Key.of(double.class))) .build(); public static void register(CommandManagerService service, CommandManager commandManager, CommandRegistrationHandler registration) { commandManager.register("paint", builder -> { - builder.description(TextComponent.of("Paint brush, apply a function to a surface")); + builder.description(TranslatableComponent.of("worldedit.brush.paint.description")); builder.action(org.enginehub.piston.Command.Action.NULL_ACTION); CommandManager manager = service.newCommandManager(); @@ -91,7 +91,7 @@ public class PaintBrushCommands { builder.condition(new PermissionCondition(ImmutableSet.of("worldedit.brush.paint"))); builder.addParts(REGION_FACTORY, RADIUS, DENSITY); - builder.addPart(SubCommandPart.builder(TranslatableComponent.of("type"), TextComponent.of("Type of brush to use")) + builder.addPart(SubCommandPart.builder(TranslatableComponent.of("type"), TranslatableComponent.of("worldedit.brush.paint.type")) .withCommands(manager.getAllCommands().collect(Collectors.toList())) .required() .build()); @@ -131,8 +131,7 @@ public class PaintBrushCommands { @Direction(includeDiagonals = true) com.sk89q.worldedit.util.Direction direction) throws WorldEditException { player.print(TextComponent.builder().append("WARNING: ", TextColor.RED, TextDecoration.BOLD) - .append("This brush simulates item usages. Its effects may not work on all platforms, may not be undo-able," + - " and may cause strange interactions with other mods/plugins. Use at your own risk.").build()); + .append(TranslatableComponent.of("worldedit.brush.paint.item.warning")).build()); setPaintBrush(parameters, player, localSession, new ItemUseFactory(item, direction)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java index 2aa18962f..3b9d11abe 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java @@ -19,7 +19,6 @@ package com.sk89q.worldedit.command; -import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.LocalSession; @@ -56,6 +55,10 @@ import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.RegionOperationException; import com.sk89q.worldedit.util.TreeGenerator.TreeType; import com.sk89q.worldedit.world.World; +import com.sk89q.worldedit.util.formatting.component.TextUtils; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; import org.enginehub.piston.annotation.param.Arg; @@ -99,12 +102,11 @@ public class RegionCommands { RegionVisitor visitor = new RegionVisitor(region, set); Operations.completeBlindly(visitor); - List messages = Lists.newArrayList(); - visitor.addStatusMessages(messages); + List messages = Lists.newArrayList(visitor.getStatusMessages()); if (messages.isEmpty()) { - actor.print("Operation completed."); + actor.printInfo(TranslatableComponent.of("worldedit.set.done")); } else { - actor.print("Operation completed (" + Joiner.on(", ").join(messages) + ")."); + actor.printInfo(TranslatableComponent.of("worldedit.set.done.verbose", TextUtils.join(messages, TextComponent.of(", ")))); } return visitor.getAffected(); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java index fe197d04b..5adc7cd54 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java @@ -27,11 +27,11 @@ import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.command.util.CommandPermissions; import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator; -import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.util.formatting.component.PaginationBox; import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.event.ClickEvent; import com.sk89q.worldedit.util.formatting.text.event.HoverEvent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; @@ -76,7 +76,7 @@ public class SnapshotCommands { LocalConfiguration config = we.getConfiguration(); if (config.snapshotRepo == null) { - actor.printError("Snapshot/backup restore is not configured."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-configured")); return; } @@ -101,7 +101,7 @@ public class SnapshotCommands { } } } catch (MissingWorldException ex) { - actor.printError("No snapshots were found for this world."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); } } @@ -117,7 +117,7 @@ public class SnapshotCommands { LocalConfiguration config = we.getConfiguration(); if (config.snapshotRepo == null) { - actor.printError("Snapshot/backup restore is not configured."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-configured")); return; } @@ -128,12 +128,12 @@ public class SnapshotCommands { if (snapshot != null) { session.setSnapshot(null); - actor.print("Now using newest snapshot."); + actor.printInfo(TranslatableComponent.of("worldedit.snapshot.use.newest")); } else { - actor.printError("No snapshots were found."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-found")); } } catch (MissingWorldException ex) { - actor.printError("No snapshots were found for this world."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); } } else { try { @@ -156,7 +156,7 @@ public class SnapshotCommands { LocalConfiguration config = we.getConfiguration(); if (config.snapshotRepo == null) { - actor.printError("Snapshot/backup restore is not configured."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-configured")); return; } @@ -179,7 +179,7 @@ public class SnapshotCommands { session.setSnapshot(snapshot); actor.print("Snapshot set to: " + snapshot.getName()); } catch (MissingWorldException e) { - actor.printError("No snapshots were found for this world."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); } } @@ -195,7 +195,7 @@ public class SnapshotCommands { LocalConfiguration config = we.getConfiguration(); if (config.snapshotRepo == null) { - actor.printError("Snapshot/backup restore is not configured."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-configured")); return; } @@ -210,7 +210,7 @@ public class SnapshotCommands { actor.print("Snapshot set to: " + snapshot.getName()); } } catch (MissingWorldException ex) { - actor.printError("No snapshots were found for this world."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); } } @@ -226,7 +226,7 @@ public class SnapshotCommands { LocalConfiguration config = we.getConfiguration(); if (config.snapshotRepo == null) { - actor.printError("Snapshot/backup restore is not configured."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-configured")); return; } @@ -240,7 +240,7 @@ public class SnapshotCommands { actor.print("Snapshot set to: " + snapshot.getName()); } } catch (MissingWorldException ex) { - actor.printError("No snapshots were found for this world."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotUtilCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotUtilCommands.java index f8dd5689a..37a0043b8 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotUtilCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotUtilCommands.java @@ -29,6 +29,8 @@ import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator; import com.sk89q.worldedit.command.util.Logging; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.regions.Region; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.DataException; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.snapshot.InvalidSnapshotException; @@ -68,7 +70,7 @@ public class SnapshotUtilCommands { LocalConfiguration config = we.getConfiguration(); if (config.snapshotRepo == null) { - actor.printError("Snapshot/backup restore is not configured."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-configured")); return; } @@ -79,7 +81,7 @@ public class SnapshotUtilCommands { try { snapshot = config.snapshotRepo.getSnapshot(snapshotName); } catch (InvalidSnapshotException e) { - actor.printError("That snapshot does not exist or is not available."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-available")); return; } } else { @@ -92,7 +94,7 @@ public class SnapshotUtilCommands { snapshot = config.snapshotRepo.getDefaultSnapshot(world.getName()); if (snapshot == null) { - actor.printError("No snapshots were found. See console for details."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-found-console")); // Okay, let's toss some debugging information! File dir = config.snapshotRepo.getDirectory(); @@ -109,7 +111,7 @@ public class SnapshotUtilCommands { return; } } catch (MissingWorldException ex) { - actor.printError("No snapshots were found for this world."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); return; } } @@ -119,9 +121,9 @@ public class SnapshotUtilCommands { // Load chunk store try { chunkStore = snapshot.getChunkStore(); - actor.print("Snapshot '" + snapshot.getName() + "' loaded; now restoring..."); + actor.printInfo(TranslatableComponent.of("worldedit.restore.loaded", TextComponent.of(snapshot.getName()))); } catch (DataException | IOException e) { - actor.printError("Failed to load snapshot: " + e.getMessage()); + actor.printError(TranslatableComponent.of("worldedit.restore.failed", TextComponent.of(e.getMessage()))); return; } @@ -135,18 +137,17 @@ public class SnapshotUtilCommands { if (restore.hadTotalFailure()) { String error = restore.getLastErrorMessage(); if (!restore.getMissingChunks().isEmpty()) { - actor.printError("Chunks were not present in snapshot."); + actor.printError(TranslatableComponent.of("worldedit.restore.chunk-not-present")); } else if (error != null) { - actor.printError("Errors prevented any blocks from being restored."); - actor.printError("Last error: " + error); + actor.printError(TranslatableComponent.of("worldedit.restore.block-place-failed")); + actor.printError(TranslatableComponent.of("worldedit.restore.block-place-error", TextComponent.of(error))); } else { - actor.printError("No chunks could be loaded. (Bad archive?)"); + actor.printError(TranslatableComponent.of("worldedit.restore.chunk-load-failed")); } } else { - actor.print(String.format("Restored; %d " - + "missing chunks and %d other errors.", - restore.getMissingChunks().size(), - restore.getErrorChunks().size())); + actor.printInfo(TranslatableComponent.of("worldedit.restore.restored", + TextComponent.of(restore.getMissingChunks().size()), + TextComponent.of(restore.getErrorChunks().size()))); } } finally { try { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java index 754473a9a..cec687204 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java @@ -29,6 +29,8 @@ import com.sk89q.worldedit.command.tool.SinglePickaxe; import com.sk89q.worldedit.command.util.CommandPermissions; import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator; import com.sk89q.worldedit.entity.Player; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; import org.enginehub.piston.annotation.param.Arg; @@ -49,7 +51,7 @@ public class SuperPickaxeCommands { public void single(Player player, LocalSession session) throws WorldEditException { session.setSuperPickaxe(new SinglePickaxe()); session.enableSuperPickAxe(); - player.print("Mode changed. Left click with a pickaxe. // to disable."); + player.printInfo(TranslatableComponent.of("worldedit.superpickaxe.mode.single")); } @Command( @@ -64,13 +66,13 @@ public class SuperPickaxeCommands { LocalConfiguration config = we.getConfiguration(); if (range > config.maxSuperPickaxeSize) { - player.printError("Maximum range: " + config.maxSuperPickaxeSize); + player.printError(TranslatableComponent.of("worldedit.superpickaxe.max-range", TextComponent.of(config.maxSuperPickaxeSize))); return; } session.setSuperPickaxe(new AreaPickaxe(range)); session.enableSuperPickAxe(); - player.print("Mode changed. Left click with a pickaxe. // to disable."); + player.printInfo(TranslatableComponent.of("worldedit.superpickaxe.mode.area")); } @Command( @@ -86,12 +88,12 @@ public class SuperPickaxeCommands { LocalConfiguration config = we.getConfiguration(); if (range > config.maxSuperPickaxeSize) { - player.printError("Maximum range: " + config.maxSuperPickaxeSize); + player.printError(TranslatableComponent.of("worldedit.superpickaxe.max-range", TextComponent.of(config.maxSuperPickaxeSize))); return; } session.setSuperPickaxe(new RecursivePickaxe(range)); session.enableSuperPickAxe(); - player.print("Mode changed. Left click with a pickaxe. // to disable."); + player.printInfo(TranslatableComponent.of("worldedit.superpickaxe.mode.recursive")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java index 9418804b6..dfcb66d1b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java @@ -24,7 +24,6 @@ import com.sk89q.worldedit.LocalConfiguration; import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; -import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.command.tool.BlockDataCyler; import com.sk89q.worldedit.command.tool.BlockReplacer; import com.sk89q.worldedit.command.tool.DistanceWand; @@ -122,10 +121,10 @@ public class ToolCommands { return "/tool " + name; } - static void setToolNone(Player player, LocalSession session, String type) + static void setToolNone(Player player, LocalSession session, boolean isBrush) throws InvalidToolBindException { session.setTool(player.getItemInHand(HandSide.MAIN_HAND).getType(), null); - player.print(type + " unbound from your current item."); + player.printInfo(TranslatableComponent.of(isBrush ? "worldedit.brush.none.equip" : "worldedit.tool.none.equip")); } private final WorldEdit we; @@ -140,7 +139,7 @@ public class ToolCommands { desc = "Unbind a bound tool from your current item" ) public void none(Player player, LocalSession session) throws WorldEditException { - setToolNone(player, session, "Tool"); + setToolNone(player, session, false); } @Command( @@ -153,7 +152,7 @@ public class ToolCommands { final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(itemType, new SelectionWand()); - player.print("Selection wand bound to " + itemType.getName() + "."); + player.printInfo(TranslatableComponent.of("worldedit.tool.selwand.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -164,9 +163,9 @@ public class ToolCommands { @CommandPermissions("worldedit.setwand") public void navwand(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new NavigationWand()); - player.print("Navigation wand bound to " + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new NavigationWand()); + player.printInfo(TranslatableComponent.of("worldedit.tool.navWand.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -176,10 +175,9 @@ public class ToolCommands { @CommandPermissions("worldedit.tool.info") public void info(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new QueryTool()); - player.print("Info tool bound to " - + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new QueryTool()); + player.printInfo(TranslatableComponent.of("worldedit.tool.info.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -191,9 +189,9 @@ public class ToolCommands { @Arg(desc = "Type of tree to generate", def = "tree") TreeGenerator.TreeType type) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new TreePlanter(type)); - player.print("Tree tool bound to " + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new TreePlanter(type)); + player.printInfo(TranslatableComponent.of("worldedit.tool.tree.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -205,9 +203,9 @@ public class ToolCommands { @Arg(desc = "The pattern of blocks to place") Pattern pattern) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new BlockReplacer(pattern)); - player.print("Block replacer tool bound to " + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new BlockReplacer(pattern)); + player.printInfo(TranslatableComponent.of("worldedit.tool.repl.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -217,9 +215,9 @@ public class ToolCommands { @CommandPermissions("worldedit.tool.data-cycler") public void cycler(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new BlockDataCyler()); - player.print("Block data cycler tool bound to " + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new BlockDataCyler()); + player.printInfo(TranslatableComponent.of("worldedit.tool.data-cycler.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -241,9 +239,9 @@ public class ToolCommands { return; } - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new FloodFillTool(range, pattern)); - player.print("Block flood fill tool bound to " + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new FloodFillTool(range, pattern)); + player.printInfo(TranslatableComponent.of("worldedit.tool.floodfill.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -253,10 +251,9 @@ public class ToolCommands { @CommandPermissions("worldedit.tool.deltree") public void deltree(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new FloatingTreeRemover()); - player.print("Floating tree remover tool bound to " - + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new FloatingTreeRemover()); + player.printInfo(TranslatableComponent.of("worldedit.tool.deltree.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -266,9 +263,9 @@ public class ToolCommands { @CommandPermissions("worldedit.tool.farwand") public void farwand(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new DistanceWand()); - player.print("Far wand tool bound to " + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new DistanceWand()); + player.printInfo(TranslatableComponent.of("worldedit.tool.farwand.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -282,10 +279,10 @@ public class ToolCommands { Pattern primary, @Arg(desc = "Pattern to set on right-click") Pattern secondary) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); - session.setTool(itemStack.getType(), new LongRangeBuildTool(primary, secondary)); - player.print("Long-range building tool bound to " + itemStack.getType().getName() + "."); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); + session.setTool(itemType, new LongRangeBuildTool(primary, secondary)); + player.printInfo(TranslatableComponent.of("worldedit.tool.lrbuild.equip", TextComponent.of(itemType.getName()))); String primaryName = "pattern"; String secondaryName = "pattern"; if (primary instanceof BlockStateHolder) { @@ -294,7 +291,6 @@ public class ToolCommands { if (secondary instanceof BlockStateHolder) { secondaryName = ((BlockStateHolder) secondary).getBlockType().getName(); } - player.print("Left-click set to " + primaryName + "; right-click set to " - + secondaryName + "."); + player.printInfo(TranslatableComponent.of("worldedit.tool.lrbuild.set", TextComponent.of(primaryName), TextComponent.of(secondaryName))); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java index c70e452e0..1252a12c6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java @@ -20,6 +20,7 @@ package com.sk89q.worldedit.command; import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.IncompleteRegionException; @@ -52,6 +53,7 @@ import com.sk89q.worldedit.regions.CylinderRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.util.formatting.component.SubtleFormat; import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockTypes; @@ -99,7 +101,7 @@ public class UtilityCommands { BlockVector3 pos = session.getPlacementPosition(actor); int affected = editSession.fillXZ(pos, pattern, radius, depth, false); - actor.print(affected + " block(s) have been created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.fill.created", affected), TextComponent.of(affected))); return affected; } @@ -123,7 +125,7 @@ public class UtilityCommands { BlockVector3 pos = session.getPlacementPosition(actor); int affected = editSession.fillXZ(pos, pattern, radius, depth, true); - actor.print(affected + " block(s) have been created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.fillr.created", affected), TextComponent.of(affected))); return affected; } @@ -140,9 +142,8 @@ public class UtilityCommands { boolean waterlogged) throws WorldEditException { radius = Math.max(0, radius); we.checkMaxRadius(radius); - int affected = editSession.drainArea( - session.getPlacementPosition(actor), radius, waterlogged); - actor.print(affected + " block(s) have been changed."); + int affected = editSession.drainArea(session.getPlacementPosition(actor), radius, waterlogged); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.drain.drained", affected), TextComponent.of(affected))); return affected; } @@ -159,7 +160,7 @@ public class UtilityCommands { radius = Math.max(0, radius); we.checkMaxRadius(radius); int affected = editSession.fixLiquid(session.getPlacementPosition(actor), radius, BlockTypes.LAVA); - actor.print(affected + " block(s) have been changed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.fixlava.fixed", affected), TextComponent.of(affected))); return affected; } @@ -176,7 +177,7 @@ public class UtilityCommands { radius = Math.max(0, radius); we.checkMaxRadius(radius); int affected = editSession.fixLiquid(session.getPlacementPosition(actor), radius, BlockTypes.WATER); - actor.print(affected + " block(s) have been changed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.fixwater.fixed", affected), TextComponent.of(affected))); return affected; } @@ -197,7 +198,7 @@ public class UtilityCommands { height = height != null ? Math.min((world.getMaxY() + 1), height + 1) : (world.getMaxY() + 1); int affected = editSession.removeAbove(session.getPlacementPosition(actor), size, height); - actor.print(affected + " block(s) have been removed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.removeabove.removed", affected), TextComponent.of(affected))); return affected; } @@ -218,7 +219,7 @@ public class UtilityCommands { height = height != null ? Math.min((world.getMaxY() + 1), height + 1) : (world.getMaxY() + 1); int affected = editSession.removeBelow(session.getPlacementPosition(actor), size, height); - actor.print(affected + " block(s) have been removed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.removebelow.removed", affected), TextComponent.of(affected))); return affected; } @@ -238,7 +239,7 @@ public class UtilityCommands { we.checkMaxRadius(radius); int affected = editSession.removeNear(session.getPlacementPosition(actor), mask, radius); - actor.print(affected + " block(s) have been removed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.removenear.removed", affected), TextComponent.of(affected))); return affected; } @@ -269,7 +270,7 @@ public class UtilityCommands { } int affected = editSession.replaceBlocks(region, from, to); - actor.print(affected + " block(s) have been replaced."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.replacenear.replaced", affected), TextComponent.of(affected))); return affected; } @@ -287,7 +288,7 @@ public class UtilityCommands { we.checkMaxRadius(size); int affected = editSession.simulateSnow(session.getPlacementPosition(actor), size); - actor.print(affected + " surface(s) covered. Let it snow~"); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.snow.created", affected), TextComponent.of(affected))); return affected; } @@ -305,7 +306,7 @@ public class UtilityCommands { we.checkMaxRadius(size); int affected = editSession.thaw(session.getPlacementPosition(actor), size); - actor.print(affected + " surface(s) thawed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.thaw.removed", affected), TextComponent.of(affected))); return affected; } @@ -326,7 +327,7 @@ public class UtilityCommands { final boolean onlyNormalDirt = !convertCoarse; final int affected = editSession.green(session.getPlacementPosition(actor), size, onlyNormalDirt); - actor.print(affected + " surface(s) greened."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.green.changed", affected), TextComponent.of(affected))); return affected; } @@ -337,7 +338,7 @@ public class UtilityCommands { ) @CommandPermissions("worldedit.extinguish") @Logging(PLACEMENT) - public void extinguish(Actor actor, LocalSession session, EditSession editSession, + public int extinguish(Actor actor, LocalSession session, EditSession editSession, @Arg(desc = "The radius of the square to remove in", def = "") Integer radius) throws WorldEditException { @@ -349,7 +350,8 @@ public class UtilityCommands { Mask mask = new BlockTypeMask(editSession, BlockTypes.FIRE); int affected = editSession.removeNear(session.getPlacementPosition(actor), mask, size); - actor.print(affected + " block(s) have been removed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.extinguish.removed", affected), TextComponent.of(affected))); + return affected; } @Command( @@ -382,7 +384,7 @@ public class UtilityCommands { if (radius == null) { radius = config.butcherDefaultRadius; } else if (radius < -1) { - actor.printError("Use -1 to remove all mobs in loaded chunks"); + actor.printError(TranslatableComponent.of("worldedit.butcher.explain-all")); return 0; } else if (radius == -1) { if (config.butcherMaxRadius != -1) { @@ -405,7 +407,11 @@ public class UtilityCommands { int killed = killMatchingEntities(radius, actor, flags::createFunction); - actor.print("Killed " + killed + (killed != 1 ? " mobs" : " mob") + (radius < 0 ? "" : " in a radius of " + radius) + "."); + actor.printInfo(TranslatableComponent.of( + pluraliseI18n("worldedit.butcher.killed", killed), + TextComponent.of(killed), + TextComponent.of(radius) + )); return killed; } @@ -423,13 +429,12 @@ public class UtilityCommands { @Arg(desc = "The radius of the cuboid to remove from") int radius) throws WorldEditException { if (radius < -1) { - actor.printError("Use -1 to remove all entities in loaded chunks"); + actor.printError(TranslatableComponent.of("worldedit.remove.explain-all")); return 0; } int removed = killMatchingEntities(radius, actor, remover::createFunction); - - actor.print("Marked " + removed + (removed != 1 ? " entities" : " entity") + " for removal."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.remove.removed", removed), TextComponent.of(removed))); return removed; } @@ -460,10 +465,10 @@ public class UtilityCommands { return killed; } - // get the formatter with the system locale. in the future, if we can get a local from a player, we can use that - private static final DecimalFormat formatter = (DecimalFormat) NumberFormat.getInstance(Locale.getDefault()); - static { - formatter.applyPattern("#,##0.#####"); // pattern is locale-insensitive. this can translate to "1.234,56789" + private DecimalFormat formatForLocale(Locale locale) { + DecimalFormat format = (DecimalFormat) NumberFormat.getInstance(locale); + format.applyPattern("#,##0.#####"); + return format; } @Command( @@ -479,14 +484,13 @@ public class UtilityCommands { try { expression = Expression.compile(String.join(" ", input)); } catch (ExpressionException e) { - actor.printError(String.format( - "'%s' could not be parsed as a valid expression", input)); + actor.printError(TranslatableComponent.of("worldedit.calc.invalid", TextComponent.of(String.join(" ", input)))); return; } WorldEditAsyncCommandBuilder.createAndSendMessage(actor, () -> { double result = expression.evaluate( new double[]{}, WorldEdit.getInstance().getSessionManager().get(actor).getTimeout()); - String formatted = Double.isNaN(result) ? "NaN" : formatter.format(result); + String formatted = Double.isNaN(result) ? "NaN" : formatForLocale(actor.getLocale()).format(result); return SubtleFormat.wrap(input + " = ").append(TextComponent.of(formatted, TextColor.LIGHT_PURPLE)); }, null); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java index 45041b587..748ee62d4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java @@ -30,9 +30,13 @@ import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Capability; -import com.sk89q.worldedit.extension.platform.NoCapablePlatformException; import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.extension.platform.PlatformManager; +import com.sk89q.worldedit.util.formatting.component.MessageBox; +import com.sk89q.worldedit.util.formatting.component.TextComponentProducer; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; import com.sk89q.worldedit.util.paste.ActorCallbackPaste; import com.sk89q.worldedit.util.report.ConfigReport; import com.sk89q.worldedit.util.report.ReportList; @@ -45,14 +49,13 @@ import org.enginehub.piston.annotation.param.Switch; import java.io.File; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.format.TextStyle; import java.time.zone.ZoneRulesException; import java.util.List; -import java.util.Locale; @CommandContainer(superTypes = CommandPermissionsConditionGenerator.Registration.class) public class WorldEditCommands { @@ -70,25 +73,31 @@ public class WorldEditCommands { desc = "Get WorldEdit version" ) public void version(Actor actor) { - actor.print("WorldEdit version " + WorldEdit.getVersion()); - actor.print("https://github.com/EngineHub/worldedit/"); + actor.printInfo(TranslatableComponent.of("worldedit.version.version", TextComponent.of(WorldEdit.getVersion()))); + actor.printInfo(TextComponent.of("https://github.com/EngineHub/worldedit/")); PlatformManager pm = we.getPlatformManager(); - actor.printDebug("----------- Platforms -----------"); + TextComponentProducer producer = new TextComponentProducer(); for (Platform platform : pm.getPlatforms()) { - actor.printDebug(String.format("* %s (%s)", platform.getPlatformName(), platform.getPlatformVersion())); + producer.append( + TextComponent.of("* ", TextColor.GRAY) + .append(TextComponent.of(platform.getPlatformName())) + .append(TextComponent.of("(" + platform.getPlatformVersion() + ")")) + ).newline(); } + actor.print(new MessageBox("Platforms", producer, TextColor.GRAY).create()); - actor.printDebug("----------- Capabilities -----------"); + producer.reset(); for (Capability capability : Capability.values()) { - try { - Platform platform = pm.queryCapability(capability); - actor.printDebug(String.format("%s: %s", capability.name(), platform != null ? platform.getPlatformName() : "NONE")); - } catch (NoCapablePlatformException e) { - actor.printDebug(String.format("%s: %s", capability.name(), "NONE")); - } + Platform platform = pm.queryCapability(capability); + producer.append( + TextComponent.of(capability.name(), TextColor.GRAY) + .append(TextComponent.of(": ") + .append(TextComponent.of(platform != null ? platform.getPlatformName() : "NONE"))) + ).newline(); } + actor.print(new MessageBox("Capabilities", producer, TextColor.GRAY).create()); } @Command( @@ -99,7 +108,7 @@ public class WorldEditCommands { public void reload(Actor actor) { we.getPlatformManager().queryCapability(Capability.CONFIGURATION).reload(); we.getEventBus().post(new ConfigurationLoadEvent(we.getPlatformManager().queryCapability(Capability.CONFIGURATION).getConfiguration())); - actor.print("Configuration reloaded!"); + actor.printInfo(TranslatableComponent.of("worldedit.reload.config")); } @Command( @@ -117,15 +126,15 @@ public class WorldEditCommands { try { File dest = new File(we.getConfiguration().getWorkingDirectory(), "report.txt"); - Files.write(result, dest, Charset.forName("UTF-8")); - actor.print("WorldEdit report written to " + dest.getAbsolutePath()); + Files.write(result, dest, StandardCharsets.UTF_8); + actor.printInfo(TranslatableComponent.of("worldedit.report.written", TextComponent.of(dest.getAbsolutePath()))); } catch (IOException e) { - actor.printError("Failed to write report: " + e.getMessage()); + actor.printError(TranslatableComponent.of("worldedit.report.error", TextComponent.of(e.getMessage()))); } if (pastebin) { actor.checkPermission("worldedit.report.pastebin"); - ActorCallbackPaste.pastebin(we.getSupervisor(), actor, result, "WorldEdit report: %s.report"); + ActorCallbackPaste.pastebin(we.getSupervisor(), actor, result, TranslatableComponent.builder("worldedit.report.callback")); } } @@ -148,12 +157,13 @@ public class WorldEditCommands { try { ZoneId tz = ZoneId.of(timezone); session.setTimezone(tz); - actor.print("Timezone set for this session to: " + tz.getDisplayName( - TextStyle.FULL, Locale.ENGLISH - )); - actor.print("The current time in that timezone is: " + dateFormat.format(ZonedDateTime.now(tz))); + actor.printInfo(TranslatableComponent.of("worldedit.timezone.set", TextComponent.of(tz.getDisplayName( + TextStyle.FULL, actor.getLocale() + )))); + actor.print(TranslatableComponent.of("worldedit.timezone.current", + TextComponent.of(dateFormat.withLocale(actor.getLocale()).format(ZonedDateTime.now(tz))))); } catch (ZoneRulesException e) { - actor.printError("Invalid timezone"); + actor.printError(TranslatableComponent.of("worldedit.timezone.invalid")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java index 662f8d71e..10005b6c3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java @@ -28,6 +28,7 @@ import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; @@ -83,7 +84,7 @@ public class AreaPickaxe implements BlockTool { } } } catch (MaxChangedBlocksException e) { - player.printError("Max blocks change limit reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java index ac3376d8d..afb37c38e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java @@ -30,6 +30,8 @@ import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.registry.state.Property; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockState; @@ -61,12 +63,12 @@ public class BlockDataCyler implements DoubleActionBlockTool { if (!config.allowedDataCycleBlocks.isEmpty() && !player.hasPermission("worldedit.override.data-cycler") && !config.allowedDataCycleBlocks.contains(block.getBlockType().getId())) { - player.printError("You are not permitted to cycle the data value of that block."); + player.printError(TranslatableComponent.of("worldedit.tool.data-cycler.block-not-permitted")); return true; } if (block.getStates().keySet().isEmpty()) { - player.printError("That block's data cannot be cycled!"); + player.printError(TranslatableComponent.of("worldedit.tool.data-cycler.cant-cycle")); } else { Property currentProperty = selectedProperties.get(player.getUniqueId()); @@ -88,9 +90,13 @@ public class BlockDataCyler implements DoubleActionBlockTool { try { editSession.setBlock(blockPoint, newBlock); - player.print("Value of " + currentProperty.getName() + " is now " + currentProperty.getValues().get(index)); + player.printInfo(TranslatableComponent.of( + "worldedit.tool.data-cycler.new-value", + TextComponent.of(currentProperty.getName()), + TextComponent.of(String.valueOf(currentProperty.getValues().get(index))) + )); } catch (MaxChangedBlocksException e) { - player.printError("Max blocks change limit reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); } @@ -101,7 +107,7 @@ public class BlockDataCyler implements DoubleActionBlockTool { index = (index + 1) % properties.size(); currentProperty = properties.get(index); selectedProperties.put(player.getUniqueId(), currentProperty); - player.print("Now cycling " + currentProperty.getName()); + player.printInfo(TranslatableComponent.of("worldedit.tool.data-cycler.cycling", TextComponent.of(currentProperty.getName()))); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java index 65d3f0ea0..48e3bbe2e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java @@ -30,6 +30,8 @@ import com.sk89q.worldedit.extent.inventory.BlockBag; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.block.BaseBlock; /** @@ -77,7 +79,7 @@ public class BlockReplacer implements DoubleActionBlockTool { if (targetBlock != null) { pattern = targetBlock; - player.print("Replacer tool switched to: " + targetBlock.getBlockType().getName()); + player.printInfo(TranslatableComponent.of("worldedit.tool.repl.switched", TextComponent.of(targetBlock.getBlockType().getName()))); } return true; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java index e8724208b..6e1c38cff 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java @@ -35,6 +35,7 @@ import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.MaskIntersection; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import javax.annotation.Nullable; @@ -183,7 +184,7 @@ public class BrushTool implements TraceTool { Location target = player.getBlockTrace(getRange(), true, traceMask); if (target == null) { - player.printError("No block in sight!"); + player.printError(TranslatableComponent.of("worldedit.tool.no-block")); return true; } @@ -207,7 +208,7 @@ public class BrushTool implements TraceTool { try { brush.build(editSession, target.toVector().toBlockPoint(), material, size); } catch (MaxChangedBlocksException e) { - player.printError("Max blocks change limit reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DistanceWand.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DistanceWand.java index 781d24f8c..2aef51e92 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DistanceWand.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DistanceWand.java @@ -28,6 +28,7 @@ import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; /** * A wand that can be used at a distance. @@ -74,7 +75,7 @@ public class DistanceWand extends BrushTool implements DoubleActionTraceTool { } if (target == null) { - player.printError("No block in sight!"); + player.printError(TranslatableComponent.of("worldedit.tool.no-block")); return null; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java index 6c644c35e..a5dc96984 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java @@ -29,6 +29,7 @@ import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Direction; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockCategories; import com.sk89q.worldedit.world.block.BlockState; @@ -72,7 +73,7 @@ public class FloatingTreeRemover implements BlockTool { final BlockState state = world.getBlock(clicked.toVector().toBlockPoint()); if (!isTreeBlock(state.getBlockType())) { - player.printError("That's not a tree."); + player.printError(TranslatableComponent.of("worldedit.tool.deltree.not-tree")); return true; } @@ -80,7 +81,7 @@ public class FloatingTreeRemover implements BlockTool { try { final Set blockSet = bfs(world, clicked.toVector().toBlockPoint()); if (blockSet == null) { - player.printError("That's not a floating tree."); + player.printError(TranslatableComponent.of("worldedit.tool.deltree.not-floating")); return true; } @@ -91,7 +92,7 @@ public class FloatingTreeRemover implements BlockTool { } } } catch (MaxChangedBlocksException e) { - player.printError("Max blocks change limit reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java index 2206b8f94..07a6114d6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java @@ -29,6 +29,7 @@ import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; @@ -73,7 +74,7 @@ public class FloodFillTool implements BlockTool { try { recurse(editSession, origin, origin, range, initialType, new HashSet<>()); } catch (MaxChangedBlocksException e) { - player.printError("Max blocks change limit reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java index f82d6961f..5121d345c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java @@ -31,6 +31,7 @@ import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.block.BaseBlock; /** @@ -118,7 +119,7 @@ public class LongRangeBuildTool extends BrushTool implements DoubleActionTraceTo } if (target == null) { - player.printError("No block in sight!"); + player.printError(TranslatableComponent.of("worldedit.tool.no-block")); return null; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java index ca4d12745..bf8f29748 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java @@ -25,6 +25,7 @@ import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; public class NavigationWand implements DoubleActionTraceTool { @Override @@ -40,7 +41,7 @@ public class NavigationWand implements DoubleActionTraceTool { if (pos != null) { player.findFreePosition(pos); } else { - player.printError("No block in sight (or too far)!"); + player.printError(TranslatableComponent.of("worldedit.jumpto.none")); } return true; } @@ -56,7 +57,7 @@ public class NavigationWand implements DoubleActionTraceTool { } if (!player.passThroughForwardWall(Math.max(1, maxDist - 10))) { - player.printError("Nothing to pass through (or too far)!"); + player.printError(TranslatableComponent.of("worldedit.thru.obstructed")); } return true; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java index 2c4e8ff87..be3ab2bdf 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java @@ -29,6 +29,7 @@ import com.sk89q.worldedit.internal.block.BlockStateIdAccess; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.event.HoverEvent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; import com.sk89q.worldedit.world.World; @@ -58,15 +59,15 @@ public class QueryTool implements BlockTool { builder.append(TextComponent.of("@" + clicked.toVector().toBlockPoint() + ": ", TextColor.BLUE)); builder.append(TextComponent.of(block.getBlockType().getName(), TextColor.YELLOW)); builder.append(TextComponent.of(" (" + block + ") ", TextColor.GRAY) - .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TextComponent.of("Block state")))); + .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TranslatableComponent.of("worldedit.tool.info.blockstate.hover")))); final OptionalInt internalId = BlockStateIdAccess.getBlockStateId(block.toImmutableState()); if (internalId.isPresent()) { builder.append(TextComponent.of(" (" + internalId.getAsInt() + ") ", TextColor.DARK_GRAY) - .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TextComponent.of("Internal ID")))); + .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TranslatableComponent.of("worldedit.tool.info.internalid.hover")))); } builder.append(TextComponent.of(" (" + world.getBlockLightLevel(blockPoint) + "/" + world.getBlockLightLevel(blockPoint.add(0, 1, 0)) + ")", TextColor.WHITE) - .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TextComponent.of("Block Light/Light Above")))); + .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TranslatableComponent.of("worldedit.tool.info.light.hover")))); player.print(builder.build()); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java index 50008bd16..f85055dab 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java @@ -28,6 +28,7 @@ import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; @@ -74,7 +75,7 @@ public class RecursivePickaxe implements BlockTool { recurse(server, editSession, world, clicked.toVector().toBlockPoint(), clicked.toVector().toBlockPoint(), range, initialType, new HashSet<>()); } catch (MaxChangedBlocksException e) { - player.printError("Max blocks change limit reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java index 6766528f4..ea724bdd8 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java @@ -28,6 +28,7 @@ import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Location; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; @@ -55,7 +56,7 @@ public class SinglePickaxe implements BlockTool { editSession.getSurvivalExtent().setToolUse(config.superPickaxeDrop); editSession.setBlock(blockPoint, BlockTypes.AIR.getDefaultState()); } catch (MaxChangedBlocksException e) { - player.printError("Max blocks change limit reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } return true; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java index ec6e16723..4eaed7f4f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java @@ -29,6 +29,7 @@ import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.TreeGenerator; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; /** * Plants a tree. @@ -62,10 +63,10 @@ public class TreePlanter implements BlockTool { } if (!successful) { - player.printError("A tree can't go there."); + player.printError(TranslatableComponent.of("worldedit.tool.tree.obstructed")); } } catch (MaxChangedBlocksException e) { - player.printError("Max. blocks changed reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java index b01b2f4fd..e8abdb958 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/AsyncCommandBuilder.java @@ -55,7 +55,7 @@ public final class AsyncCommandBuilder { @Nullable private String description; @Nullable - private String delayMessage; + private Component delayMessage; @Nullable private Component successMessage; @@ -84,7 +84,12 @@ public final class AsyncCommandBuilder { return this; } + @Deprecated public AsyncCommandBuilder sendMessageAfterDelay(String message) { + return sendMessageAfterDelay(TextComponent.of(checkNotNull(message))); + } + + public AsyncCommandBuilder sendMessageAfterDelay(Component message) { this.delayMessage = checkNotNull(message); return this; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/FutureProgressListener.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/FutureProgressListener.java index 54d366ba4..3a47679a6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/FutureProgressListener.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/FutureProgressListener.java @@ -24,6 +24,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.sk89q.worldedit.extension.platform.Actor; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; import java.util.Timer; @@ -34,7 +36,12 @@ public class FutureProgressListener implements Runnable { private final MessageTimerTask task; + @Deprecated public FutureProgressListener(Actor sender, String message) { + this(sender, TextComponent.of(message)); + } + + public FutureProgressListener(Actor sender, Component message) { checkNotNull(sender); checkNotNull(message); @@ -47,8 +54,13 @@ public class FutureProgressListener implements Runnable { task.cancel(); } + @Deprecated public static void addProgressListener(ListenableFuture future, Actor sender, String message) { future.addListener(new FutureProgressListener(sender, message), MoreExecutors.directExecutor()); } + public static void addProgressListener(ListenableFuture future, Actor sender, Component message) { + future.addListener(new FutureProgressListener(sender, message), MoreExecutors.directExecutor()); + } + } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/MessageTimerTask.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/MessageTimerTask.java index 4a2549318..fa12e40be 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/MessageTimerTask.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/MessageTimerTask.java @@ -22,15 +22,22 @@ package com.sk89q.worldedit.command.util; import static com.google.common.base.Preconditions.checkNotNull; import com.sk89q.worldedit.extension.platform.Actor; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; import java.util.TimerTask; public class MessageTimerTask extends TimerTask { private final Actor sender; - private final String message; + private final Component message; + @Deprecated MessageTimerTask(Actor sender, String message) { + this(sender, TextComponent.of(message)); + } + + MessageTimerTask(Actor sender, Component message) { checkNotNull(sender); checkNotNull(message); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Actor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Actor.java index cdcba32a2..536e329f4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Actor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Actor.java @@ -24,8 +24,10 @@ import com.sk89q.worldedit.session.SessionOwner; import com.sk89q.worldedit.util.Identifiable; import com.sk89q.worldedit.util.auth.Subject; import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; import java.io.File; +import java.util.Locale; /** * An object that can perform actions in WorldEdit. @@ -52,30 +54,65 @@ public interface Actor extends Identifiable, SessionOwner, Subject { * Print a message. * * @param msg The message text + * @deprecated Use component-based functions (print) */ + @Deprecated void printRaw(String msg); /** * Print a WorldEdit message. * * @param msg The message text + * @deprecated Use component-based functions (printDebug) */ + @Deprecated void printDebug(String msg); /** * Print a WorldEdit message. * * @param msg The message text + * @deprecated Use component-based functions (printInfo) */ + @Deprecated void print(String msg); /** * Print a WorldEdit error. * * @param msg The error message text + * @deprecated Use component-based functions (printError) */ + @Deprecated void printError(String msg); + /** + * Print a WorldEdit error. + * + * @param component The component to print + */ + default void printError(Component component) { + print(component.color(TextColor.RED)); + } + + /** + * Print a WorldEdit message. + * + * @param component The component to print + */ + default void printInfo(Component component) { + print(component.color(TextColor.LIGHT_PURPLE)); + } + + /** + * Print a WorldEdit message. + * + * @param component The component to print + */ + default void printDebug(Component component) { + print(component.color(TextColor.GRAY)); + } + /** * Print a {@link Component}. * @@ -120,4 +157,10 @@ public interface Actor extends Identifiable, SessionOwner, Subject { */ void dispatchCUIEvent(CUIEvent event); + /** + * Get the locale of this actor. + * + * @return The locale + */ + Locale getLocale(); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java index 2bcddc7f8..ec07821f2 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java @@ -533,15 +533,15 @@ public final class PlatformCommandManager { if (config.profile) { long time = System.currentTimeMillis() - start; + double timeS = (time / 1000.0); int changed = editSession.getBlockChangeCount(); - if (time > 0) { - double throughput = changed / (time / 1000.0); - actor.printDebug((time / 1000.0) + "s elapsed (history: " - + changed + " changed; " - + Math.round(throughput) + " blocks/sec)."); - } else { - actor.printDebug((time / 1000.0) + "s elapsed."); - } + double throughput = timeS == 0 ? changed : changed / timeS; + actor.printDebug(TranslatableComponent.of( + "worldedit.command.time-elapsed", + TextComponent.of(timeS), + TextComponent.of(changed), + TextComponent.of(Math.round(throughput)) + )); } worldEdit.flushBlockBag(actor, editSession); @@ -577,7 +577,7 @@ public final class PlatformCommandManager { private void handleUnknownException(Actor actor, Throwable t) { actor.printError("Please report this error: [See console]"); - actor.printRaw(t.getClass().getName() + ": " + t.getMessage()); + actor.print(TextComponent.of(t.getClass().getName() + ": " + t.getMessage())); log.error("An unexpected error while handling a WorldEdit command", t); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java index 36e36914b..581d5141d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java @@ -34,10 +34,6 @@ import com.sk89q.worldedit.event.platform.Interaction; import com.sk89q.worldedit.event.platform.PlatformInitializeEvent; import com.sk89q.worldedit.event.platform.PlatformReadyEvent; import com.sk89q.worldedit.event.platform.PlayerInputEvent; -import com.sk89q.worldedit.extension.platform.permission.ActorSelectorLimits; -import com.sk89q.worldedit.math.BlockVector3; -import com.sk89q.worldedit.math.Vector3; -import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.session.request.Request; import com.sk89q.worldedit.util.HandSide; import com.sk89q.worldedit.util.Location; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java index 120dd47ac..d40bf4df4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java @@ -36,6 +36,7 @@ import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.gamemode.GameMode; +import java.util.Locale; import java.util.UUID; import javax.annotation.Nullable; @@ -183,4 +184,9 @@ class PlayerProxy extends AbstractPlayerActor { public void floatAt(int x, int y, int z, boolean alwaysGlass) { basePlayer.floatAt(x, y, z, alwaysGlass); } + + @Override + public Locale getLocale() { + return basePlayer.getLocale(); + } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java index 591cb936b..029c78953 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java @@ -109,10 +109,6 @@ public class ChunkBatchingExtent extends AbstractBufferingExtent { @Override public void cancel() { } - - @Override - public void addStatusMessages(List messages) { - } }; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/FastModeExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/FastModeExtent.java index 4c43f06f9..ba4dc6e0d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/FastModeExtent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/FastModeExtent.java @@ -146,10 +146,6 @@ public class FastModeExtent extends AbstractDelegateExtent { @Override public void cancel() { } - - @Override - public void addStatusMessages(List messages) { - } }; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java index 0098d455a..ce127f96a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java @@ -22,6 +22,7 @@ package com.sk89q.worldedit.function.factory; import static com.google.common.base.Preconditions.checkNotNull; import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull; +import com.google.common.collect.Lists; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.WorldEdit; @@ -36,7 +37,12 @@ import com.sk89q.worldedit.internal.expression.ExpressionException; import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.regions.NullRegion; import com.sk89q.worldedit.regions.Region; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; +import java.util.Collection; import java.util.List; public class Deform implements Contextual { @@ -186,9 +192,11 @@ public class Deform implements Contextual { public void cancel() { } + @Override - public void addStatusMessages(List messages) { - messages.add("deformed using " + expression); + public Iterable getStatusMessages() { + return Lists.newArrayList(TranslatableComponent.of("worldedit.operation.deform.expression", + TextComponent.of(expression).color(TextColor.LIGHT_PURPLE))); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ChangeSetExecutor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ChangeSetExecutor.java index 54ea500f0..fbd065051 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ChangeSetExecutor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ChangeSetExecutor.java @@ -80,10 +80,6 @@ public class ChangeSetExecutor implements Operation { public void cancel() { } - @Override - public void addStatusMessages(List messages) { - } - /** * Create a new undo operation. * diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/DelegateOperation.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/DelegateOperation.java index 69560ec56..b0a881eae 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/DelegateOperation.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/DelegateOperation.java @@ -21,8 +21,11 @@ package com.sk89q.worldedit.function.operation; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.collect.Iterables; import com.sk89q.worldedit.WorldEditException; +import com.sk89q.worldedit.util.formatting.text.Component; +import java.util.Collection; import java.util.List; /** @@ -60,9 +63,8 @@ public class DelegateOperation implements Operation { } @Override - public void addStatusMessages(List messages) { - original.addStatusMessages(messages); - delegate.addStatusMessages(messages); + public Iterable getStatusMessages() { + return Iterables.concat(original.getStatusMessages(), delegate.getStatusMessages()); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java index 9512b5c3d..ddc35e107 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java @@ -21,6 +21,7 @@ package com.sk89q.worldedit.function.operation; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; @@ -46,7 +47,12 @@ import com.sk89q.worldedit.math.transform.Identity; import com.sk89q.worldedit.math.transform.Transform; import com.sk89q.worldedit.regions.FlatRegion; import com.sk89q.worldedit.regions.Region; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; +import java.util.ArrayList; import java.util.List; /** @@ -337,25 +343,16 @@ public class ForwardExtentCopy implements Operation { } @Override - public void addStatusMessages(List messages) { - StringBuilder msg = new StringBuilder(); - msg.append(affectedBlocks).append(" block(s)"); - if (affectedBiomeCols > 0) { - if (affectedEntities > 0) { - msg.append(", "); - } else { - msg.append(" and "); - } - msg.append(affectedBiomeCols).append(" biome(s)"); - } - if (affectedEntities > 0) { - if (affectedBiomeCols > 0) { - msg.append(","); - } - msg.append(" and ").append(affectedEntities).append(" entities(s)"); - } - msg.append(" affected."); - messages.add(msg.toString()); + public Iterable getStatusMessages() { + List messages = new ArrayList<>(); + messages.add(TranslatableComponent.of(pluraliseI18n("worldedit.operation.affected.block", affectedBlocks), + TextComponent.of(affectedBlocks)).color(TextColor.LIGHT_PURPLE)); + messages.add(TranslatableComponent.of(pluraliseI18n("worldedit.operation.affected.biome", affectedBiomeCols), + TextComponent.of(affectedBiomeCols)).color(TextColor.LIGHT_PURPLE)); + messages.add(TranslatableComponent.of(pluraliseI18n("worldedit.operation.affected.entity", affectedEntities), + TextComponent.of(affectedEntities)).color(TextColor.LIGHT_PURPLE)); + + return messages; } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/Operation.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/Operation.java index a69653151..5ae25eb2b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/Operation.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/Operation.java @@ -20,8 +20,12 @@ package com.sk89q.worldedit.function.operation; import com.sk89q.worldedit.WorldEditException; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * An task that may be split into multiple steps to be run sequentially @@ -56,7 +60,22 @@ public interface Operation { * of the operation. * * @param messages The list to add messages to + * @deprecated Will be removed in WorldEdit 8.0 - use the Component variant */ - void addStatusMessages(List messages); + @Deprecated + default void addStatusMessages(List messages) { + } + /** + * Gets an iterable of messages that describe the current status of the + * operation. + * + * @return The status messages + */ + default Iterable getStatusMessages() { + // TODO Remove legacy code WorldEdit 8.0.0 + List oldMessages = new ArrayList<>(); + addStatusMessages(oldMessages); + return oldMessages.stream().map(TextComponent::of).collect(Collectors.toList()); + } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java index 53e79fa3d..b9a9a36ab 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java @@ -21,13 +21,16 @@ package com.sk89q.worldedit.function.operation; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; +import com.sk89q.worldedit.util.formatting.text.Component; import java.util.ArrayDeque; import java.util.Collection; import java.util.Deque; import java.util.List; +import java.util.stream.Collectors; /** * Executes multiple queues in order. @@ -105,10 +108,8 @@ public class OperationQueue implements Operation { } @Override - public void addStatusMessages(List messages) { - for (Operation operation : operations) { - operation.addStatusMessages(messages); - } + public Iterable getStatusMessages() { + return Iterables.concat(operations.stream().map(Operation::getStatusMessages).collect(Collectors.toList())); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/SetLocatedBlocks.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/SetLocatedBlocks.java index 1e418bb04..2989bdcec 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/SetLocatedBlocks.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/SetLocatedBlocks.java @@ -49,8 +49,4 @@ public class SetLocatedBlocks implements Operation { public void cancel() { } - @Override - public void addStatusMessages(List messages) { - } - } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java index 26b14f38c..9d4144d3f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java @@ -20,13 +20,19 @@ package com.sk89q.worldedit.function.visitor; import static com.google.common.base.Preconditions.checkNotNull; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; +import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.function.RegionFunction; import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.RunContext; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.Direction; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; import java.util.ArrayDeque; import java.util.ArrayList; @@ -119,10 +125,9 @@ public abstract class BreadthFirstSearch implements Operation { * @param position the position */ public void visit(BlockVector3 position) { - BlockVector3 blockVector = position; - if (!visited.contains(blockVector)) { - queue.add(blockVector); - visited.add(blockVector); + if (!visited.contains(position)) { + queue.add(position); + visited.add(position); } } @@ -133,11 +138,10 @@ public abstract class BreadthFirstSearch implements Operation { * @param to the block under question */ private void visit(BlockVector3 from, BlockVector3 to) { - BlockVector3 blockVector = to; - if (!visited.contains(blockVector)) { - visited.add(blockVector); + if (!visited.contains(to)) { + visited.add(to); if (isVisitable(from, to)) { - queue.add(blockVector); + queue.add(to); } } } @@ -183,8 +187,11 @@ public abstract class BreadthFirstSearch implements Operation { } @Override - public void addStatusMessages(List messages) { - messages.add(getAffected() + " blocks affected"); + public Iterable getStatusMessages() { + return Lists.newArrayList(TranslatableComponent.of( + pluraliseI18n("worldedit.operation.affected.block", getAffected()), + TextComponent.of(getAffected()) + ).color(TextColor.LIGHT_PURPLE)); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java index c3ce36567..719fa3e60 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java @@ -20,13 +20,20 @@ package com.sk89q.worldedit.function.visitor; import static com.google.common.base.Preconditions.checkNotNull; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; +import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.function.EntityFunction; import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.RunContext; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; +import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -77,8 +84,11 @@ public class EntityVisitor implements Operation { } @Override - public void addStatusMessages(List messages) { - messages.add(getAffected() + " entities affected"); + public Iterable getStatusMessages() { + return Lists.newArrayList(TranslatableComponent.of( + pluraliseI18n("worldedit.operation.affected.entity", getAffected()), + TextComponent.of(getAffected()) + ).color(TextColor.LIGHT_PURPLE)); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java index 46ef33dc0..e7b0daa57 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java @@ -20,14 +20,21 @@ package com.sk89q.worldedit.function.visitor; import static com.google.common.base.Preconditions.checkNotNull; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; +import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.function.FlatRegionFunction; import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.RunContext; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.FlatRegion; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; +import java.util.Collection; import java.util.List; /** @@ -78,8 +85,11 @@ public class FlatRegionVisitor implements Operation { } @Override - public void addStatusMessages(List messages) { - messages.add(getAffected() + " columns affected"); + public Iterable getStatusMessages() { + return Lists.newArrayList(TranslatableComponent.of( + pluraliseI18n("worldedit.operation.affected.column", getAffected()), + TextComponent.of(getAffected()) + ).color(TextColor.LIGHT_PURPLE)); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/LayerVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/LayerVisitor.java index f683637b3..3fed7f678 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/LayerVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/LayerVisitor.java @@ -128,8 +128,4 @@ public class LayerVisitor implements Operation { public void cancel() { } - @Override - public void addStatusMessages(List messages) { - } - } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java index 12a955c0d..4f595584b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java @@ -19,14 +19,19 @@ package com.sk89q.worldedit.function.visitor; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; + +import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.function.RegionFunction; import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.RunContext; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.Region; - -import java.util.List; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; /** * Utility class to apply region functions to {@link com.sk89q.worldedit.regions.Region}. @@ -67,8 +72,11 @@ public class RegionVisitor implements Operation { } @Override - public void addStatusMessages(List messages) { - messages.add(getAffected() + " blocks affected"); + public Iterable getStatusMessages() { + return Lists.newArrayList(TranslatableComponent.of( + pluraliseI18n("worldedit.operation.affected.block", getAffected()), + TextComponent.of(getAffected()) + ).color(TextColor.LIGHT_PURPLE)); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/CraftScriptContext.java b/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/CraftScriptContext.java index f31e0ba44..65fe99a7d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/CraftScriptContext.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/CraftScriptContext.java @@ -32,6 +32,7 @@ import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.session.request.Request; +import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.util.io.file.FilenameException; import com.sk89q.worldedit.world.block.BaseBlock; @@ -114,7 +115,7 @@ public class CraftScriptContext extends CraftScriptEnvironment { * @param message a message */ public void print(String message) { - player.print(message); + player.printInfo(TextComponent.of(message)); } /** @@ -123,16 +124,16 @@ public class CraftScriptContext extends CraftScriptEnvironment { * @param message a message */ public void error(String message) { - player.printError(message); + player.printError(TextComponent.of(message)); } /** - * Print an raw message to the user. + * Print a raw message to the user. * * @param message a message */ public void printRaw(String message) { - player.printRaw(message); + player.print(TextComponent.of(message)); } /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/WorldEditText.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/WorldEditText.java index 897a3fa46..1e2b0728e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/WorldEditText.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/WorldEditText.java @@ -19,11 +19,14 @@ package com.sk89q.worldedit.util.formatting; +import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.util.formatting.text.Component; import org.enginehub.piston.config.ConfigHolder; import org.enginehub.piston.config.TextConfig; import org.enginehub.piston.util.TextHelper; +import java.util.Locale; + public class WorldEditText { public static final ConfigHolder CONFIG_HOLDER = ConfigHolder.create(); @@ -31,12 +34,12 @@ public class WorldEditText { CONFIG_HOLDER.getConfig(TextConfig.commandPrefix()).setValue("/"); } - public static Component format(Component component) { - return CONFIG_HOLDER.replace(component); + public static Component format(Component component, Locale locale) { + return CONFIG_HOLDER.replace(WorldEdit.getInstance().getTranslationManager().convertText(component, locale)); } - public static String reduceToText(Component component) { - return TextHelper.reduceToText(format(component)); + public static String reduceToText(Component component, Locale locale) { + return TextHelper.reduceToText(format(component, locale)); } private WorldEditText() { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java index e5fceb008..223d92f16 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java @@ -36,13 +36,22 @@ public class MessageBox extends TextComponentProducer { private static final int GUARANTEED_NO_WRAP_CHAT_PAGE_WIDTH = 47; private TextComponentProducer contents; + private TextColor borderColor; /** * Create a new box. */ public MessageBox(String title, TextComponentProducer contents) { + this(title, contents, TextColor.YELLOW); + } + + /** + * Create a new box. + */ + public MessageBox(String title, TextComponentProducer contents, TextColor borderColor) { checkNotNull(title); + this.borderColor = borderColor; append(centerAndBorder(TextComponent.of(title))).newline(); this.contents = contents; } @@ -74,7 +83,7 @@ public class MessageBox extends TextComponentProducer { private TextComponent createBorder(int count) { return TextComponent.of(Strings.repeat("-", count), - TextColor.YELLOW, Sets.newHashSet(TextDecoration.STRIKETHROUGH)); + borderColor, Sets.newHashSet(TextDecoration.STRIKETHROUGH)); } /** diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/TextUtils.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/TextUtils.java new file mode 100644 index 000000000..f604d322a --- /dev/null +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/TextUtils.java @@ -0,0 +1,49 @@ +/* + * WorldEdit, a Minecraft world manipulation toolkit + * Copyright (C) sk89q + * Copyright (C) WorldEdit team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldedit.util.formatting.component; + +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; + +import java.util.List; + +public class TextUtils { + + private TextUtils() { + } + + /** + * Join an array of components with a joiner component. + * + * @param components The components to join + * @param joiner The joiner component + * @return The joined component + */ + public static Component join(List components, Component joiner) { + TextComponent.Builder builder = TextComponent.builder(); + for (int i = 0; i < components.size(); i++) { + builder.append(components.get(i)); + if (i < components.size() - 1) { + builder.append(joiner); + } + } + return builder.build(); + } +} diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java index 09ac4724f..1f3555353 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java @@ -40,4 +40,17 @@ public class ResourceLoader { } return url; } + + public static URL getResourceRoot(String name) throws IOException { + URL url = ResourceLoader.class.getResource("/" + name); + if (url == null) { + try { + return new URL("modjar://worldedit/" + name); + } catch (Exception e) { + // Not forge. + } + throw new IOException("Could not find " + name); + } + return url; + } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java index 1eb51a21f..a0d677e74 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java @@ -21,6 +21,8 @@ package com.sk89q.worldedit.util.paste; import com.sk89q.worldedit.command.util.AsyncCommandBuilder; import com.sk89q.worldedit.extension.platform.Actor; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.task.Supervisor; import java.net.URL; @@ -41,7 +43,9 @@ public final class ActorCallbackPaste { * @param sender The sender * @param content The content * @param successMessage The message, formatted with {@link String#format(String, Object...)} on success + * @deprecated Use the Component-based version */ + @Deprecated public static void pastebin(Supervisor supervisor, final Actor sender, String content, final String successMessage) { Callable task = paster.paste(content); @@ -53,4 +57,24 @@ public final class ActorCallbackPaste { .buildAndExec(Pasters.getExecutor()); } + /** + * Submit data to a pastebin service and inform the sender of + * success or failure. + * + * @param supervisor The supervisor instance + * @param sender The sender + * @param content The content + * @param successMessage The message builder, given the URL as an arg + */ + public static void pastebin(Supervisor supervisor, final Actor sender, String content, final TranslatableComponent.Builder successMessage) { + Callable task = paster.paste(content); + + AsyncCommandBuilder.wrap(task, sender) + .registerWithSupervisor(supervisor, "Submitting content to a pastebin service.") + .sendMessageAfterDelay(TranslatableComponent.of("worldedit.pastebin.uploading")) + .onSuccess((String) null, url -> sender.printInfo(successMessage.args(TextComponent.of(url.toString())).build())) + .onFailure("Failed to submit paste", null) + .buildAndExec(Pasters.getExecutor()); + } + } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/LocalisationHelpers.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/LocalisationHelpers.java new file mode 100644 index 000000000..7909076b5 --- /dev/null +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/LocalisationHelpers.java @@ -0,0 +1,42 @@ +/* + * WorldEdit, a Minecraft world manipulation toolkit + * Copyright (C) sk89q + * Copyright (C) WorldEdit team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldedit.util.translation; + +public class LocalisationHelpers { + + private LocalisationHelpers() { + } + + /** + * Turn a translation key into a ".singular" or ".plural" + * depending on what the given number is. + * + * @param translationKey The base translation key + * @param number The number + * @return The key with .plural or .singular appended + */ + public static String pluraliseI18n(String translationKey, float number) { + if (number == 1) { + return translationKey + ".singular"; + } else { + return translationKey + ".plural"; + } + } +} diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java new file mode 100644 index 000000000..ab5d1e3d1 --- /dev/null +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java @@ -0,0 +1,144 @@ +/* + * WorldEdit, a Minecraft world manipulation toolkit + * Copyright (C) sk89q + * Copyright (C) WorldEdit team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldedit.util.translation; + +import com.google.common.io.Files; +import com.google.common.io.Resources; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import com.sk89q.worldedit.WorldEdit; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.renderer.FriendlyComponentRenderer; +import com.sk89q.worldedit.util.io.ResourceLoader; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Type; +import java.net.URL; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.text.MessageFormat; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +/** + * Handles translations for the plugin. + * + * These should be in the following format: + * plugin.component.message[.meta]* + * + * Where, + * plugin = worldedit + * component = The part of the plugin, eg expand + * message = A descriptor for which message, eg, expanded + * meta = Any extra information such as plural/singular (Can have none to infinite) + */ +public class TranslationManager { + + private static final Gson gson = new GsonBuilder().create(); + private static final Type STRING_MAP_TYPE = new TypeToken>() {}.getType(); + + private final Map> translationMap = new HashMap<>(); + private final FriendlyComponentRenderer friendlyComponentRenderer = FriendlyComponentRenderer.from( + (locale, key) -> new MessageFormat(getTranslationMap(locale).getOrDefault(key, key), locale)); + private Locale defaultLocale = Locale.ENGLISH; + + private final WorldEdit worldEdit; + + private final Set checkedLocales = new HashSet<>(); + + public TranslationManager(WorldEdit worldEdit) { + this.worldEdit = worldEdit; + } + + public void setDefaultLocale(Locale defaultLocale) { + this.defaultLocale = defaultLocale; + } + + private Map parseTranslationFile(File file) throws IOException { + return gson.fromJson(Files.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE); + } + + private Map parseTranslationFile(URL file) throws IOException { + return gson.fromJson(Resources.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE); + } + + private Optional> loadTranslationFile(String filename) { + File localFile = worldEdit.getWorkingDirectoryFile("lang/" + filename); + if (localFile.exists()) { + try { + return Optional.of(parseTranslationFile(localFile)); + } catch (IOException e) { + return Optional.empty(); + } + } else { + try { + return Optional.of(parseTranslationFile(ResourceLoader.getResourceRoot("lang/" + filename))); + } catch (IOException e) { + return Optional.empty(); + } + } + } + + private boolean tryLoadTranslations(Locale locale) { + if (checkedLocales.contains(locale)) { + return false; + } + checkedLocales.add(locale); + Optional> langData = loadTranslationFile(locale.getLanguage() + "-" + locale.getCountry() + "/strings.json"); + if (!langData.isPresent()) { + langData = loadTranslationFile(locale.getLanguage() + "/strings.json"); + } + if (langData.isPresent()) { + translationMap.put(locale, langData.get()); + return true; + } + if (locale.equals(defaultLocale)) { + translationMap.put(Locale.ENGLISH, loadTranslationFile("strings.json").orElseThrow( + () -> new RuntimeException("Failed to load WorldEdit strings!") + )); + return true; + } + return false; + } + + private Map getTranslationMap(Locale locale) { + Map translations = translationMap.get(locale); + if (translations == null) { + if (tryLoadTranslations(locale)) { + return getTranslationMap(locale); + } + if (!locale.equals(defaultLocale)) { + translations = getTranslationMap(defaultLocale); + } + } + + return translations; + } + + public Component convertText(Component component, Locale locale) { + return friendlyComponentRenderer.render(component, locale); + } +} diff --git a/worldedit-core/src/main/resources/lang/.gitignore b/worldedit-core/src/main/resources/lang/.gitignore new file mode 100644 index 000000000..0a00d7014 --- /dev/null +++ b/worldedit-core/src/main/resources/lang/.gitignore @@ -0,0 +1 @@ +*/ \ No newline at end of file diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json new file mode 100644 index 000000000..f5ecde2b0 --- /dev/null +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -0,0 +1,198 @@ +{ + "worldedit.expand.description.vert": "Vertically expand the selection to world limits.", + "worldedit.expand.expanded.singular": "Region expanded {0} block", + "worldedit.expand.expanded.plural": "Region expanded {0} blocks", + "worldedit.expand.expanded.vert.singular": "Region expanded {0} block (top-to-bottom).", + "worldedit.expand.expanded.vert.plural": "Region expanded {0} blocks (top-to-bottom).", + + "worldedit.biomeinfo.lineofsight.singular": "Biome at line of sight point: {0}", + "worldedit.biomeinfo.lineofsight.plural": "Biomes at line of sight point: {0}", + "worldedit.biomeinfo.position.singular": "Biome at your position: {0}", + "worldedit.biomeinfo.position.plural": "Biomes at your position: {0}", + "worldedit.biomeinfo.selection.singular": "Biome in your selection: {0}", + "worldedit.biomeinfo.selection.plural": "Biomes in your selection: {0}", + + "worldedit.brush.apply.description": "Apply brush, apply a function to every block", + "worldedit.brush.apply.radius": "The size of the brush", + "worldedit.brush.apply.shape": "The shape of the region", + "worldedit.brush.apply.type": "Type of brush to use", + "worldedit.brush.apply.item.warning": "This brush simulates item usages. Its effects may not work on all platforms, may not be undo-able, and may cause strange interactions with other mods/plugins. Use at your own risk.", + "worldedit.brush.paint.description": "Paint brush, apply a function to a surface", + "worldedit.brush.paint.size": "The size of the brush", + "worldedit.brush.paint.shape": "The shape of the region", + "worldedit.brush.paint.density": "The density of the brush", + "worldedit.brush.paint.type": "Type of brush to use", + "worldedit.brush.paint.item.warning": "This brush simulates item usages. Its effects may not work on all platforms, may not be undo-able, and may cause strange interactions with other mods/plugins. Use at your own risk.", + "worldedit.brush.sphere.equip": "Sphere brush shape equipped ({0}).", + "worldedit.brush.cylinder.equip": "Cylinder brush shape equipped ({0} by {1}).", + "worldedit.brush.clipboard.equip": "Clipboard brush shape equipped.", + "worldedit.brush.smooth.equip": "Smooth brush equipped ({0} x {1}x using {2}).", + "worldedit.brush.extinguish.equip": "Extinguisher equipped ({0}).", + "worldedit.brush.gravity.equip": "Gravity brush equipped ({0}).", + "worldedit.brush.butcher.equip": "Butcher brush equipped ({0}).", + "worldedit.brush.operation.equip": "Set brush to {0}.", + "worldedit.brush.none.equip": "Brush unbound from your current item.", + + "worldedit.setbiome.changed.singular": "Biomes were changed in {0} column. You may have to rejoin your game (or close and reopen your world) to see a change.", + "worldedit.setbiome.changed.plural": "Biomes were changed in {0} columns. You may have to rejoin your game (or close and reopen your world) to see a change.", + + "worldedit.drawsel.disabled": "Server CUI disabled.", + "worldedit.drawsel.enabled": "Server CUI enabled. This only supports cuboid regions, with a maximum size of 32x32x32.", + "worldedit.drawsel.disabled.already": "Server CUI already disabled.", + "worldedit.drawsel.enabled.already": "Server CUI already enabled.", + "worldedit.limit.too-high": "Your maximum allowable limit is {0}.", + "worldedit.limit.set": "Block change limit set to {0}.", + "worldedit.limit.return-to-default": " (Use //limit to go back to the default.)", + "worldedit.timeout.too-high": "Your maximum allowable timeout is {0}ms.", + "worldedit.timeout.set": "Timeout time set to {0} ms.", + "worldedit.timeout.return-to-default": " (Use //timeout to go back to the default.)", + "worldedit.fast.disabled": "Fast mode disabled.", + "worldedit.fast.enabled": "Fast mode enabled. Lighting in the affected chunks may be wrong and/or you may need to rejoin to see changes.", + "worldedit.fast.disabled.already": "Fast mode already disabled.", + "worldedit.fast.enabled.already": "Fast mode already enabled.", + "worldedit.reorder.current": "The reorder mode is {0}", + "worldedit.reorder.set": "The reorder mode is now {0}", + "worldedit.gmask.disabled": "Global mask disabled.", + "worldedit.gmask.set": "Global mask set.", + "worldedit.toggleplace.pos1": "Now placing at pos #1.", + "worldedit.toggleplace.player": "Now placing at the block you stand in.", + "worldedit.searchitem.too-short": "Enter a longer search string (len > 2).", + "worldedit.searchitem.b-and-i": "You cannot use both the 'b' and 'i' flags simultaneously.", + + "worldedit.undo.undone": "Undid {0} available edits.", + "worldedit.undo.none": "Nothing left to undo.", + "worldedit.redo.undone": "Redid {0} available edits.", + "worldedit.redo.none": "Nothing left to redo.", + "worldedit.clearhistory.cleared": "History cleared.", + + "worldedit.raytrace.noblock": "No block in sight!", + + "worldedit.restore.not-configured": "Snapshot/backup restore is not configured.", + "worldedit.restore.not-available": "That snapshot does not exist or is not available.", + "worldedit.restore.failed": "Failed to load snapshot: {0}", + "worldedit.restore.loaded": "Snapshot '{0}' loaded; now restoring...", + "worldedit.restore.restored": "Restored; {0} missing chunks and {1} other errors.", + "worldedit.restore.none-for-world": "No snapshots were found for this world.", + "worldedit.restore.none-found": "No snapshots were found.", + "worldedit.restore.none-found-console": "No snapshots were found. See console for details.", + "worldedit.restore.chunk-not-present": "Chunks were not present in snapshot.", + "worldedit.restore.chunk-load-failed": "No chunks could be loaded. (Bad archive?)", + "worldedit.restore.block-place-failed": "Errors prevented any blocks from being restored.", + "worldedit.restore.block-place-error": "Last error: {0}", + + "worldedit.snapshot.use.newest": "Now using newest snapshot.", + + "worldedit.drain.drained.singular": "{0} block has been drained.", + "worldedit.drain.drained.plural": "{0} blocks have been drained.", + "worldedit.fill.created.singular": "{0} block has been filled.", + "worldedit.fill.created.plural": "{0} blocks have been filled.", + "worldedit.fillr.created.singular": "{0} block has been filled.", + "worldedit.fillr.created.plural": "{0} blocks have been filled.", + "worldedit.fixlava.fixed.singular": "{0} block has been fixed.", + "worldedit.fixlava.fixed.plural": "{0} blocks have been fixed.", + "worldedit.fixwater.fixed.singular": "{0} block has been fixed.", + "worldedit.fixwater.fixed.plural": "{0} blocks have been fixed.", + "worldedit.removeabove.removed.singular": "{0} block has been removed.", + "worldedit.removeabove.removed.plural": "{0} blocks have been removed.", + "worldedit.removebelow.removed.singular": "{0} block has been removed.", + "worldedit.removebelow.removed.plural": "{0} blocks have been removed.", + "worldedit.removenear.removed.singular": "{0} block has been removed.", + "worldedit.removenear.removed.plural": "{0} blocks have been removed.", + "worldedit.replacenear.replaced.singular": "{0} block has been replaced.", + "worldedit.replacenear.replaced.plural": "{0} blocks have been replaced.", + "worldedit.snow.created.singular": "{0} surface has been covered.", + "worldedit.snow.created.plural": "{0} surfaces have been covered.", + "worldedit.thaw.removed.singular": "{0} block has been thawed.", + "worldedit.thaw.removed.plural": "{0} blocks have been thawed.", + "worldedit.green.changed.singular": "{0} block has been greened.", + "worldedit.green.changed.plural": "{0} blocks have been greened.", + "worldedit.extinguish.removed.singular": "{0} fire has been extinguished.", + "worldedit.extinguish.removed.plural": "{0} fires have been extinguished.", + "worldedit.butcher.killed.singular": "{0} mob has been killed in a radius of {1}.", + "worldedit.butcher.killed.plural": "{0} mobs have been killed in a radius of {1}.", + "worldedit.butcher.explain-all": "Use -1 to remove all mobs in loaded chunks", + "worldedit.remove.removed.singular": "{0} entity has been marked for removal.", + "worldedit.remove.removed.plural": "{0} entities have been marked for removal.", + "worldedit.remove.explain-all": "Use -1 to remove all entities in loaded chunks", + "worldedit.calc.invalid": "'{0}' could not be parsed as a valid expression", + + "worldedit.paste.pasted": "The clipboard has been pasted at {0}", + "worldedit.paste.selected": "Selected clipboard paste region.", + "worldedit.rotate.no-interpolation": "Note: Interpolation is not yet supported, so angles that are multiples of 90 is recommended.", + "worldedit.rotate.rotated": "The clipboard copy has been rotated.", + "worldedit.flip.flipped": "The clipboard copy has been flipped.", + "worldedit.clearclipboard.cleared": "Clipboard cleared.", + + "worldedit.set.done": "Operation completed.", + "worldedit.set.done.verbose": "Operation completed ({0}).", + + "worldedit.unstuck.moved": "There you go!", + "worldedit.ascend.obstructed": "No free spot above you found.", + "worldedit.ascend.moved.singular": "Ascended a level.", + "worldedit.ascend.moved.plural": "Ascended {0} levels.", + "worldedit.descend.obstructed": "No free spot below you found.", + "worldedit.descend.moved.singular": "Descended a level.", + "worldedit.descend.moved.plural": "Descended {0} levels.", + "worldedit.ceil.obstructed": "No free spot above you found.", + "worldedit.ceil.moved": "Woosh!", + "worldedit.thru.obstructed": "No free spot ahead of you found.", + "worldedit.thru.moved": "Woosh!", + "worldedit.jumpto.moved": "Poof!", + "worldedit.jumpto.none": "No block in sight (or too far away)!", + "worldedit.up.obstructed": "You would hit something above you.", + "worldedit.up.moved": "Woosh!", + + "worldedit.reload.config": "Configuration reloaded!", + "worldedit.report.written": "WorldEdit report written to {0}", + "worldedit.report.error": "Failed to write report: {0}", + "worldedit.report.callback": "WorldEdit report: {0}.report", + "worldedit.timezone.invalid": "Invalid timezone", + "worldedit.timezone.set": "Timezone set for this session to: {0}", + "worldedit.timezone.current": "The current time in that timezone is: {0}", + "worldedit.version.version": "WorldEdit version {0}", + + "worldedit.command.time-elapsed": "{0}s elapsed (history: {1} changed; {2} blocks/sec).", + "worldedit.pastebin.uploading": "(Please wait... sending output to pastebin...)", + "worldedit.session.cant-find-session": "Unable to find session for {0}", + + "worldedit.tool.max-block-changes": "Max blocks change limit reached.", + "worldedit.tool.no-block": "No block in sight!", + "worldedit.tool.repl.equip": "Block replacer tool bound to {0}.", + "worldedit.tool.repl.switched": "Replacer tool switched to: {0}", + "worldedit.tool.data-cycler.equip": "Block data cycler tool bound to {0}.", + "worldedit.tool.data-cycler.block-not-permitted": "You are not permitted to cycle the data value of that block.", + "worldedit.tool.data-cycler.cant-cycle": "That block's data cannot be cycled!", + "worldedit.tool.data-cycler.new-value": "Value of {0} is now {1}.", + "worldedit.tool.data-cycler.cycling": "Now cycling {0}.", + "worldedit.tool.deltree.equip": "Floating tree remover tool bound to {0}.", + "worldedit.tool.deltree.not-tree": "That's not a tree.", + "worldedit.tool.deltree.not-floating": "That's not a floating tree.", + "worldedit.tool.tree.equip": "Tree tool bound to {0}.", + "worldedit.tool.tree.obstructed": "A tree can't go there.", + "worldedit.tool.info.equip": "Info tool bound to {0}.", + "worldedit.tool.info.blockstate.hover": "Block state", + "worldedit.tool.info.internalid.hover": "Internal ID", + "worldedit.tool.info.light.hover": "Block Light/Light Above", + "worldedit.tool.none.equip": "Tool unbound from your current item.", + "worldedit.tool.selwand.equip": "Selection wand bound to {0}.", + "worldedit.tool.navwand.equip": "Navigation wand bound to {0}.", + "worldedit.tool.floodfill.equip": "Block flood fill tool bound to {0}.", + "worldedit.tool.farwand.equip": "Far wand tool bound to {0}.", + "worldedit.tool.lrbuild.equip": "Long-range building tool bound to {0}.", + "worldedit.tool.lrbuild.set": "Left-click set to {0}; right-click set to {1}.", + + "worldedit.superpickaxe.mode.single": "Mode is now single. Left click with a pickaxe. // to disable.", + "worldedit.superpickaxe.mode.area": "Mode is now area. Left click with a pickaxe. // to disable.", + "worldedit.superpickaxe.mode.recursive": "Mode is now recursive. Left click with a pickaxe. // to disable.", + "worldedit.superpickaxe.max-range": "Maximum range is {0}.", + + "worldedit.operation.affected.biome.singular": "{0} biome affected", + "worldedit.operation.affected.biome.plural": "{0} biomes affected", + "worldedit.operation.affected.block.singular": "{0} block affected", + "worldedit.operation.affected.block.plural": "{0} blocks affected", + "worldedit.operation.affected.column.singular": "{0} column affected", + "worldedit.operation.affected.column.plural": "{0} columns affected", + "worldedit.operation.affected.entity.singular": "{0} entity affected", + "worldedit.operation.affected.entity.plural": "{0} entities affected", + "worldedit.operation.deform.expression": "deformed using {0}" +} \ No newline at end of file diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlayer.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlayer.java index 60003a259..48507f8fe 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlayer.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlayer.java @@ -25,6 +25,7 @@ import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.extension.platform.AbstractPlayerActor; import com.sk89q.worldedit.extent.inventory.BlockBag; +import com.sk89q.worldedit.fabric.mixin.AccessorServerPlayerEntity; import com.sk89q.worldedit.fabric.net.handler.WECUIPacketHandler; import com.sk89q.worldedit.internal.cui.CUIEvent; import com.sk89q.worldedit.math.BlockVector3; @@ -56,6 +57,7 @@ import net.minecraft.util.math.BlockPos; import javax.annotation.Nullable; import java.io.IOException; +import java.util.Locale; import java.util.UUID; public class FabricPlayer extends AbstractPlayerActor { @@ -128,6 +130,11 @@ public class FabricPlayer extends AbstractPlayerActor { this.player.networkHandler.sendPacket(packet); } + @Override + public Locale getLocale() { + return Locale.forLanguageTag(((AccessorServerPlayerEntity) this.player).getClientLanguage().replace("_", "-")); + } + @Override public void printRaw(String msg) { for (String part : msg.split("\n")) { @@ -152,7 +159,7 @@ public class FabricPlayer extends AbstractPlayerActor { @Override public void print(Component component) { - this.player.sendMessage(Text.Serializer.fromJson(GsonComponentSerializer.INSTANCE.serialize(WorldEditText.format(component)))); + this.player.sendMessage(Text.Serializer.fromJson(GsonComponentSerializer.INSTANCE.serialize(WorldEditText.format(component, getLocale())))); } private void sendColorized(String msg, Formatting formatting) { diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerEntity.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerEntity.java new file mode 100644 index 000000000..a7e86af41 --- /dev/null +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerEntity.java @@ -0,0 +1,31 @@ +/* + * WorldEdit, a Minecraft world manipulation toolkit + * Copyright (C) sk89q + * Copyright (C) WorldEdit team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldedit.fabric.mixin; + +import net.minecraft.server.network.ServerPlayerEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(ServerPlayerEntity.class) +public interface AccessorServerPlayerEntity { + + @Accessor("clientLanguage") + String getClientLanguage(); +} diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java index fbad989c1..822bb0954 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java @@ -27,6 +27,7 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Hand; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; diff --git a/worldedit-fabric/src/main/resources/worldedit.mixins.json b/worldedit-fabric/src/main/resources/worldedit.mixins.json index fd6cd4f92..623a5c8d5 100644 --- a/worldedit-fabric/src/main/resources/worldedit.mixins.json +++ b/worldedit-fabric/src/main/resources/worldedit.mixins.json @@ -4,7 +4,8 @@ "compatibilityLevel": "JAVA_8", "mixins": [ "MixinServerPlayerEntity", - "MixinMinecraftServer" + "MixinMinecraftServer", + "AccessorServerPlayerEntity" ], "server": [ ], diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java index 22250e0de..2c5a35573 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java @@ -55,6 +55,7 @@ import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import java.io.IOException; +import java.util.Locale; import java.util.UUID; import javax.annotation.Nullable; @@ -153,7 +154,7 @@ public class ForgePlayer extends AbstractPlayerActor { @Override public void print(Component component) { - this.player.sendMessage(ITextComponent.Serializer.fromJson(GsonComponentSerializer.INSTANCE.serialize(WorldEditText.format(component)))); + this.player.sendMessage(ITextComponent.Serializer.fromJson(GsonComponentSerializer.INSTANCE.serialize(WorldEditText.format(component, getLocale())))); } private void sendColorized(String msg, TextFormatting formatting) { @@ -203,6 +204,11 @@ public class ForgePlayer extends AbstractPlayerActor { } } + @Override + public Locale getLocale() { + return Locale.forLanguageTag(player.language.replace('_', '-')); + } + @Override public > void sendFakeBlock(BlockVector3 pos, B block) { World world = getWorld(); diff --git a/worldedit-forge/src/main/resources/META-INF/accesstransformer.cfg b/worldedit-forge/src/main/resources/META-INF/accesstransformer.cfg index 9c1530b89..5e9a97889 100644 --- a/worldedit-forge/src/main/resources/META-INF/accesstransformer.cfg +++ b/worldedit-forge/src/main/resources/META-INF/accesstransformer.cfg @@ -1 +1,2 @@ -public net.minecraft.server.MinecraftServer field_211151_aa # serverTime \ No newline at end of file +public net.minecraft.server.MinecraftServer field_211151_aa # serverTime +public net.minecraft.entity.player.ServerPlayerEntity field_71148_cg # language diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/CommandAdapter.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/CommandAdapter.java index 01340ae4b..9564b1722 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/CommandAdapter.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/CommandAdapter.java @@ -54,17 +54,17 @@ public abstract class CommandAdapter implements CommandCallable { @Override public Optional getShortDescription(CommandSource source) { return Optional.of(command.getDescription()) - .map(SpongeTextAdapter::convert); + .map(desc -> SpongeTextAdapter.convert(desc, source.getLocale())); } @Override public Optional 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()); } } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java index 4f8b7fa44..fb3d31695 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java @@ -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() { diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java index aa0056710..6603a5bd4 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java @@ -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()); diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeTextAdapter.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeTextAdapter.java index 4e7b5c2fb..7b8a127e4 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeTextAdapter.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeTextAdapter.java @@ -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)); } From 1cca2182a97ebe035c9e7a03fdbb1ee0344019c2 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 13 Oct 2019 22:06:54 +1000 Subject: [PATCH 02/16] Fixed gradle setup --- worldedit-core/build.gradle.kts | 44 +++++++++++++++------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index e03d384fb..877199c84 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -90,29 +90,25 @@ sourceSets { val crowdinApiKey = "crowdin_apikey" -fun Project.applyPlatformCrowdInConfig() { - if (!project.hasProperty(crowdinApiKey)) ext[crowdinApiKey] = "" +if (!project.hasProperty(crowdinApiKey)) ext[crowdinApiKey] = "" - apply(plugin = "com.mendhak.gradlecrowdin") - - tasks.named("crowdinUpload") { - apiKey = crowdinApiKey - projectId = "worldedit-core" - files = arrayOf( - object { - var name = "strings.json" - var source = "$projectDir/src/main/resources/lang/strings.json" - } - ) - } - - tasks.named("crowdinDownload") { - apiKey = crowdinApiKey - destination = "$projectDir/src/main/resources/lang" - projectId = "worldedit-core" - } - - tasks.named("processResources").configure { - dependsOn("crowdinDownload") - } +tasks.named("crowdinUpload") { + apiKey = "${project.property(crowdinApiKey)}" + projectId = "worldedit-core" + files = arrayOf( + object { + var name = "strings.json" + var source = "$projectDir/src/main/resources/lang/strings.json" + } + ) +} + +tasks.named("crowdinDownload") { + apiKey = "${project.property(crowdinApiKey)}" + destination = "$projectDir/src/main/resources/lang" + projectId = "worldedit-core" +} + +tasks.named("processResources").configure { + dependsOn("crowdinDownload") } From c01d2f7c24526a5b553539852a2d509e72a92f28 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Mon, 21 Oct 2019 23:45:02 +1000 Subject: [PATCH 03/16] Further translations --- .../worldedit/command/BrushCommands.java | 2 +- .../worldedit/command/ExpandCommands.java | 2 +- .../worldedit/command/GeneralCommands.java | 10 ++-- .../worldedit/command/RegionCommands.java | 43 +++++++-------- .../worldedit/command/SchematicCommands.java | 23 ++++---- .../command/util/PrintCommandHelp.java | 4 +- .../platform/AbstractPlayerActor.java | 3 +- .../extension/platform/PlayerProxy.java | 9 ++-- .../src/main/resources/lang/strings.json | 54 ++++++++++++++++++- 9 files changed, 103 insertions(+), 47 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java index 5f716484a..c151a5f1d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java @@ -290,7 +290,7 @@ public class BrushCommands { maxRadius = Math.max(config.maxBrushRadius, config.butcherMaxRadius); } if (radius > maxRadius) { - player.printError("Maximum allowed brush radius: " + maxRadius); + player.printError(TranslatableComponent.of("worldedit.bruch.radius-too-large", TextComponent.of(maxRadius))); return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java index b9a8a3093..d7e908e53 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java @@ -116,7 +116,7 @@ public class ExpandCommands { TranslatableComponent.of(pluraliseI18n("worldedit.expand.expanded.vert", changeSize), TextComponent.of(changeSize)) ); } catch (RegionOperationException e) { - player.printError(e.getMessage()); + player.printError(TextComponent.of(e.getMessage())); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java index 80639abd3..da7950b63 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java @@ -203,9 +203,9 @@ public class GeneralCommands { @Arg(desc = "The world override", def = "") World world) { session.setWorldOverride(world); if (world == null) { - actor.print("Removed world override."); + actor.printInfo(TranslatableComponent.of("worldedit.world.remove")); } else { - actor.print("Set the world override to " + world.getId() + ". (Use //world to go back to default)"); + actor.printInfo(TranslatableComponent.of("worldedit.world.set", TextComponent.of(world.getId()))); } } @@ -220,16 +220,16 @@ public class GeneralCommands { @Arg(desc = "The mode to set the watchdog hook to", def = "") HookMode hookMode) { if (WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS).getWatchdog() == null) { - actor.printError("This platform has no watchdog hook."); + actor.printError(TranslatableComponent.of("worldedit.watchdog.no-hook")); return; } boolean previousMode = session.isTickingWatchdog(); if (hookMode != null && (hookMode == HookMode.ACTIVE) == previousMode) { - actor.printError("Watchdog hook already " + (previousMode ? "active" : "inactive") + "."); + actor.printError(TranslatableComponent.of(previousMode ? "worldedit.help.already-active" : "worldedit.help.already-inactive")); return; } session.setTickingWatchdog(!previousMode); - actor.print("Watchdog hook now " + (previousMode ? "inactive" : "active") + "."); + actor.printInfo(TranslatableComponent.of(previousMode ? "worldedit.help.now-inactive" : "worldedit.help.now-active")); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java index 3b9d11abe..59584a1e8 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java @@ -75,6 +75,7 @@ import static com.sk89q.worldedit.internal.command.CommandUtil.checkCommandArgum import static com.sk89q.worldedit.regions.Regions.asFlatRegion; import static com.sk89q.worldedit.regions.Regions.maximumBlockY; import static com.sk89q.worldedit.regions.Regions.minimumBlockY; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Commands that operate on regions. @@ -128,7 +129,7 @@ public class RegionCommands { @Switch(name = 'h', desc = "Generate only a shell") boolean shell) throws WorldEditException { if (!(region instanceof CuboidRegion)) { - actor.printError("//line only works with cuboid selections"); + actor.printError(TranslatableComponent.of("worldedit.line.cuboid-only")); return 0; } checkCommandArgument(thickness >= 0, "Thickness must be >= 0"); @@ -138,7 +139,7 @@ public class RegionCommands { BlockVector3 pos2 = cuboidregion.getPos2(); int blocksChanged = editSession.drawLine(pattern, pos1, pos2, thickness, !shell); - actor.print(blocksChanged + " block(s) have been changed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.line.changed", blocksChanged), TextComponent.of(blocksChanged))); return blocksChanged; } @@ -158,7 +159,7 @@ public class RegionCommands { @Switch(name = 'h', desc = "Generate only a shell") boolean shell) throws WorldEditException { if (!(region instanceof ConvexPolyhedralRegion)) { - actor.printError("//curve only works with convex polyhedral selections"); + actor.printError(TranslatableComponent.of("worldedit.curve.convex-only")); return 0; } checkCommandArgument(thickness >= 0, "Thickness must be >= 0"); @@ -168,7 +169,7 @@ public class RegionCommands { int blocksChanged = editSession.drawSpline(pattern, vectors, 0, 0, 0, 10, thickness, !shell); - actor.print(blocksChanged + " block(s) have been changed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.curve.changed", blocksChanged), TextComponent.of(blocksChanged))); return blocksChanged; } @@ -188,7 +189,7 @@ public class RegionCommands { from = new ExistingBlockMask(editSession); } int affected = editSession.replaceBlocks(region, from, to); - actor.print(affected + " block(s) have been replaced."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.replace.replaced", affected), TextComponent.of(affected))); return affected; } @@ -202,7 +203,7 @@ public class RegionCommands { @Arg(desc = "The pattern of blocks to overlay") Pattern pattern) throws WorldEditException { int affected = editSession.overlayCuboidBlocks(region, pattern); - actor.print(affected + " block(s) have been overlaid."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.overlay.overlaid", affected), TextComponent.of(affected))); return affected; } @@ -217,7 +218,7 @@ public class RegionCommands { @Arg(desc = "The pattern of blocks to set") Pattern pattern) throws WorldEditException { int affected = editSession.center(region, pattern); - actor.print("Center set (" + affected + " block(s) changed)"); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.center.changed", affected), TextComponent.of(affected))); return affected; } @@ -229,7 +230,7 @@ public class RegionCommands { @Logging(REGION) public int naturalize(Actor actor, EditSession editSession, @Selection Region region) throws WorldEditException { int affected = editSession.naturalizeCuboidBlocks(region); - actor.print(affected + " block(s) have been made to look more natural."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.naturalize.naturalized", affected), TextComponent.of(affected))); return affected; } @@ -243,7 +244,7 @@ public class RegionCommands { @Arg(desc = "The pattern of blocks to set") Pattern pattern) throws WorldEditException { int affected = editSession.makeWalls(region, pattern); - actor.print(affected + " block(s) have been changed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.walls.changed", affected), TextComponent.of(affected))); return affected; } @@ -258,7 +259,7 @@ public class RegionCommands { @Arg(desc = "The pattern of blocks to set") Pattern pattern) throws WorldEditException { int affected = editSession.makeCuboidFaces(region, pattern); - actor.print(affected + " block(s) have been changed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.faces.changed", affected), TextComponent.of(affected))); return affected; } @@ -277,7 +278,7 @@ public class RegionCommands { HeightMap heightMap = new HeightMap(editSession, region, mask); HeightMapFilter filter = new HeightMapFilter(new GaussianKernel(5, 1.0)); int affected = heightMap.applyFilter(filter, iterations); - actor.print("Terrain's height map smoothed. " + affected + " block(s) changed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.smooth.changed", affected), TextComponent.of(affected))); return affected; } @@ -328,11 +329,11 @@ public class RegionCommands { session.getRegionSelector(world).learnChanges(); session.getRegionSelector(world).explainRegionAdjust(actor, session); } catch (RegionOperationException e) { - actor.printError(e.getMessage()); + actor.printError(TextComponent.of(e.getMessage())); } } - actor.print(affected + " block(s) moved."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.move.moved", affected), TextComponent.of(affected))); return affected; } @@ -383,11 +384,11 @@ public class RegionCommands { session.getRegionSelector(world).learnChanges(); session.getRegionSelector(world).explainRegionAdjust(actor, session); } catch (RegionOperationException e) { - actor.printError(e.getMessage()); + actor.printError(TextComponent.of(e.getMessage())); } } - actor.print(affected + " block(s) changed. Undo with //undo"); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.stack.changed", affected), TextComponent.of(affected))); return affected; } @@ -408,7 +409,7 @@ public class RegionCommands { } finally { session.setMask(mask); } - actor.print("Region regenerated."); + actor.printInfo(TranslatableComponent.of("worldedit.regen.regenerated")); } @Command( @@ -454,10 +455,10 @@ public class RegionCommands { if (actor instanceof Player) { ((Player) actor).findFreePosition(); } - actor.print(affected + " block(s) have been deformed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.deform.deformed", affected), TextComponent.of(affected))); return affected; } catch (ExpressionException e) { - actor.printError(e.getMessage()); + actor.printError(TextComponent.of(e.getMessage())); return 0; } } @@ -478,7 +479,7 @@ public class RegionCommands { checkCommandArgument(thickness >= 0, "Thickness must be >= 0"); int affected = editSession.hollowOutRegion(region, thickness, pattern); - actor.print(affected + " block(s) have been changed."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.hollow.changed", affected), TextComponent.of(affected))); return affected; } @@ -495,7 +496,7 @@ public class RegionCommands { double density) throws WorldEditException { checkCommandArgument(0 <= density && density <= 100, "Density must be in [0, 100]"); int affected = editSession.makeForest(region, density / 100, type); - actor.print(affected + " trees created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.forest.created", affected), TextComponent.of(affected))); return affected; } @@ -517,7 +518,7 @@ public class RegionCommands { Operations.completeLegacy(visitor); int affected = ground.getAffected(); - actor.print(affected + " flora created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.flora.created", affected), TextComponent.of(affected))); return affected; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java index 321537a71..07d30991f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java @@ -46,6 +46,7 @@ import com.sk89q.worldedit.util.formatting.component.ErrorFormat; import com.sk89q.worldedit.util.formatting.component.PaginationBox; import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.event.ClickEvent; import com.sk89q.worldedit.util.formatting.text.event.HoverEvent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; @@ -112,7 +113,7 @@ public class SchematicCommands { ClipboardFormats.getFileExtensionArray()); if (!f.exists()) { - actor.printError("Schematic " + filename + " does not exist!"); + actor.printError(TranslatableComponent.of("worldedit.schematic.load.does-not-exist", TextComponent.of(filename))); return; } @@ -121,7 +122,7 @@ public class SchematicCommands { format = ClipboardFormats.findByAlias(formatName); } if (format == null) { - actor.printError("Unknown schematic format: " + formatName); + actor.printError(TranslatableComponent.of("worldedit.schematic.unknown-format", TextComponent.of(formatName))); return; } @@ -156,7 +157,7 @@ public class SchematicCommands { ClipboardFormat format = ClipboardFormats.findByAlias(formatName); if (format == null) { - actor.printError("Unknown schematic format: " + formatName); + actor.printError(TranslatableComponent.of("worldedit.schematic.unknown-format", TextComponent.of(formatName))); return; } @@ -168,7 +169,7 @@ public class SchematicCommands { throw new StopExecutionException(TextComponent.of("That schematic already exists!")); } if (!allowOverwrite) { - actor.printError("That schematic already exists. Use the -f flag to overwrite it."); + actor.printError(TranslatableComponent.of("worldedit.schematic.save.already-exists")); return; } } @@ -177,8 +178,8 @@ public class SchematicCommands { File parent = f.getParentFile(); if (parent != null && !parent.exists()) { if (!parent.mkdirs()) { - throw new StopExecutionException(TextComponent.of( - "Could not create folder for schematics!")); + throw new StopExecutionException(TranslatableComponent.of( + "worldedit.schematic.save.failed-directory")); } } @@ -209,16 +210,16 @@ public class SchematicCommands { dir, filename, "schematic", ClipboardFormats.getFileExtensionArray()); if (!f.exists()) { - actor.printError("Schematic " + filename + " does not exist!"); + actor.printError(TranslatableComponent.of("worldedit.schematic.delete.does-not-exist", TextComponent.of(filename))); return; } if (!f.delete()) { - actor.printError("Deletion of " + filename + " failed! Maybe it is read-only."); + actor.printError(TranslatableComponent.of("worldedit.schematic.delete.failed", TextComponent.of(filename))); return; } - actor.print(filename + " has been deleted."); + actor.printInfo(TranslatableComponent.of("worldedit.schematic.delete.deleted", TextComponent.of(filename))); try { log.info(actor.getName() + " deleted " + f.getCanonicalPath()); } catch (IOException e) { @@ -233,7 +234,7 @@ public class SchematicCommands { ) @CommandPermissions("worldedit.schematic.formats") public void formats(Actor actor) { - actor.print("Available clipboard formats (Name: Lookup names)"); + actor.printInfo(TranslatableComponent.of("worldedit.schematic.formats.title")); StringBuilder builder; boolean first = true; for (ClipboardFormat format : ClipboardFormats.getAll()) { @@ -247,7 +248,7 @@ public class SchematicCommands { first = false; } first = true; - actor.print(builder.toString()); + actor.printInfo(TextComponent.of(builder.toString())); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java index dc3e97865..bd674f108 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java @@ -27,6 +27,8 @@ import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.util.formatting.component.CommandListBox; import com.sk89q.worldedit.util.formatting.component.CommandUsageBox; import com.sk89q.worldedit.util.formatting.component.InvalidComponentException; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import org.enginehub.piston.Command; import org.enginehub.piston.CommandManager; @@ -78,7 +80,7 @@ public class PrintCommandHelp { List visited = new ArrayList<>(); Command currentCommand = detectCommand(manager, commandPath.get(0)); if (currentCommand == null) { - actor.printError(String.format("The command '%s' could not be found.", commandPath.get(0))); + actor.printError(TranslatableComponent.of("worldedit.help.command-not-found", TextComponent.of(commandPath.get(0)))); return; } visited.add(currentCommand); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java index 1b378b4c3..775cd2475 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java @@ -35,6 +35,7 @@ import com.sk89q.worldedit.util.HandSide; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.TargetBlock; import com.sk89q.worldedit.util.auth.AuthorizationException; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; @@ -264,10 +265,8 @@ public abstract class AbstractPlayerActor implements Actor, Player, Cloneable { if (world.getBlock(BlockVector3.at(x, y, z)).getBlockType().getMaterial().isMovementBlocker()) { int platformY = Math.max(initialY, y - 3 - clearance); if (platformY < initialY) { // if ==, they already have the given clearance, if <, clearance is too large - printError("Not enough space above you!"); return false; } else if (platformY == initialY) { - printError("You're already at the ceiling."); return false; } floatAt(x, platformY + 1, z, alwaysGlass); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java index d40bf4df4..020067995 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java @@ -32,6 +32,7 @@ import com.sk89q.worldedit.session.SessionKey; import com.sk89q.worldedit.util.HandSide; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.gamemode.GameMode; @@ -116,22 +117,22 @@ class PlayerProxy extends AbstractPlayerActor { @Override public void printRaw(String msg) { - basePlayer.printRaw(msg); + basePlayer.print(TextComponent.of(msg)); } @Override public void printDebug(String msg) { - basePlayer.printDebug(msg); + basePlayer.printDebug(TextComponent.of(msg)); } @Override public void print(String msg) { - basePlayer.print(msg); + basePlayer.printInfo(TextComponent.of(msg)); } @Override public void printError(String msg) { - basePlayer.printError(msg); + basePlayer.printError(TextComponent.of(msg)); } @Override diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index f5ecde2b0..53e9ec6e5 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -12,6 +12,7 @@ "worldedit.biomeinfo.selection.singular": "Biome in your selection: {0}", "worldedit.biomeinfo.selection.plural": "Biomes in your selection: {0}", + "worldedit.bruch.radius-too-large": "Maximum allowed brush radius: {0}", "worldedit.brush.apply.description": "Apply brush, apply a function to every block", "worldedit.brush.apply.radius": "The size of the brush", "worldedit.brush.apply.shape": "The shape of the region", @@ -58,6 +59,13 @@ "worldedit.toggleplace.player": "Now placing at the block you stand in.", "worldedit.searchitem.too-short": "Enter a longer search string (len > 2).", "worldedit.searchitem.b-and-i": "You cannot use both the 'b' and 'i' flags simultaneously.", + "worldedit.watchdog.no-hook": "This platform has no watchdog hook.", + "worldedit.watchdog.already-active": "Watchdog hook already active.", + "worldedit.watchdog.already-inactive": "Watchdog hook already inactive.", + "worldedit.watchdog.now-active": "Watchdog hook now active.", + "worldedit.watchdog.now-inactive": "Watchdog hook now inactive.", + "worldedit.world.remove": "Removed world override.", + "worldedit.world.set": "Set the world override to {0}. (Use //world to go back to default)", "worldedit.undo.undone": "Undid {0} available edits.", "worldedit.undo.none": "Nothing left to undo.", @@ -82,6 +90,15 @@ "worldedit.snapshot.use.newest": "Now using newest snapshot.", + "worldedit.schematic.unknown-format": "Unknown schematic format: {0}.", + "worldedit.schematic.load.does-not-exist": "Schematic {0} does not exist!", + "worldedit.schematic.save.already-exists": "That schematic already exists. Use the -f flag to overwrite it.", + "worldedit.schematic.save.failed-directory": "Could not create folder for schematics!", + "worldedit.schematic.delete.does-not-exist": "Schematic {0} does not exist!", + "worldedit.schematic.delete.failed": "Deletion of {0} failed! Is it read-only?", + "worldedit.schematic.delete.deleted": "{0} has been deleted.", + "worldedit.schematic.formats.title": "Available clipboard formats (Name: Lookup names)", + "worldedit.drain.drained.singular": "{0} block has been drained.", "worldedit.drain.drained.plural": "{0} blocks have been drained.", "worldedit.fill.created.singular": "{0} block has been filled.", @@ -125,6 +142,39 @@ "worldedit.set.done": "Operation completed.", "worldedit.set.done.verbose": "Operation completed ({0}).", + "worldedit.line.changed.singular": "{0} block has been changed.", + "worldedit.line.changed.plural": "{0} blocks have been changed.", + "worldedit.line.cuboid-only": "//line only works with cuboid selections", + "worldedit.curve.changed.singular": "{0} block has been changed.", + "worldedit.curve.changed.plural": "{0} blocks have been changed.", + "worldedit.curve.convex-only": "//curve only works with convex polyhedral selections", + "worldedit.replace.replaced.singular": "{0} block has been replaced.", + "worldedit.replace.replaced.plural": "{0} blocks have been replaced.", + "worldedit.stack.changed.singular": "{0} block changed. Undo with //undo", + "worldedit.stack.changed.plural": "{0} blocks changed. Undo with //undo", + "worldedit.regen.regenerated": "Region regenerated.", + "worldedit.walls.changed.singular": "{0} block has been changed.", + "worldedit.walls.changed.plural": "{0} blocks have been changed.", + "worldedit.faces.changed.singular": "{0} block has been changed.", + "worldedit.faces.changed.plural": "{0} blocks have been changed.", + "worldedit.overlay.overlaid.singular": "{0} block has been overlaid.", + "worldedit.overlay.overlaid.plural": "{0} blocks have been overlaid.", + "worldedit.naturalize.naturalized.singular": "{0} block has been made to look more natural.", + "worldedit.naturalize.naturalized.plural": "{0} block(s) have been made to look more natural.", + "worldedit.center.changed.singular": "Center set. ({0} block changed)", + "worldedit.center.changed.plural": "Center set. ({0} blocks changed)", + "worldedit.smooth.changed.singular": "Terrain's height map smoothed. {0} block changed.", + "worldedit.smooth.changed.plural": "Terrain's height map smoothed. {0} blocks changed.", + "worldedit.move.moved.singular": "{0} block moved.", + "worldedit.move.moved.plural": "{0} blocks moved.", + "worldedit.deform.deformed.singular": "{0} block has been deformed.", + "worldedit.deform.deformed.plural": "{0} blocks have been deformed.", + "worldedit.hollow.changed.singular": "{0} block has been changed.", + "worldedit.hollow.changed.plural": "{0} blocks have been changed.", + "worldedit.forest.created.singular": "{0} tree created.", + "worldedit.forest.created.plural": "{0} trees created.", + "worldedit.flora.created.singular": "{0} flora created.", + "worldedit.flora.created.plural": "{0} flora created.", "worldedit.unstuck.moved": "There you go!", "worldedit.ascend.obstructed": "No free spot above you found.", @@ -194,5 +244,7 @@ "worldedit.operation.affected.column.plural": "{0} columns affected", "worldedit.operation.affected.entity.singular": "{0} entity affected", "worldedit.operation.affected.entity.plural": "{0} entities affected", - "worldedit.operation.deform.expression": "deformed using {0}" + "worldedit.operation.deform.expression": "deformed using {0}", + + "worldedit.help.command-not-found": "The command '{0}' could not be found." } \ No newline at end of file From 455a40b3fcab97cd498582b01e2aebabd265b9f2 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Tue, 22 Oct 2019 20:14:52 +1000 Subject: [PATCH 04/16] Add a few more strings --- .../worldedit/command/GeneralCommands.java | 4 +-- .../worldedit/command/GenerationCommands.java | 25 +++++++++++-------- .../generator/GardenPatchGenerator.java | 6 ++--- .../src/main/resources/lang/strings.json | 17 +++++++++++++ 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java index da7950b63..38f66b71a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java @@ -225,11 +225,11 @@ public class GeneralCommands { } boolean previousMode = session.isTickingWatchdog(); if (hookMode != null && (hookMode == HookMode.ACTIVE) == previousMode) { - actor.printError(TranslatableComponent.of(previousMode ? "worldedit.help.already-active" : "worldedit.help.already-inactive")); + actor.printError(TranslatableComponent.of(previousMode ? "worldedit.watchdog.already-active" : "worldedit.watchdog.already-inactive")); return; } session.setTickingWatchdog(!previousMode); - actor.printInfo(TranslatableComponent.of(previousMode ? "worldedit.help.now-inactive" : "worldedit.help.now-active")); + actor.printInfo(TranslatableComponent.of(previousMode ? "worldedit.watchdog.now-inactive" : "worldedit.watchdog.now-active")); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java index 501028d17..92fe2222a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java @@ -36,6 +36,8 @@ import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.util.TreeGenerator.TreeType; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.biome.BiomeType; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; @@ -49,6 +51,7 @@ import static com.sk89q.worldedit.command.util.Logging.LogMode.ALL; import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT; import static com.sk89q.worldedit.command.util.Logging.LogMode.POSITION; import static com.sk89q.worldedit.internal.command.CommandUtil.checkCommandArgument; +import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Commands for the generation of shapes and other objects. @@ -113,7 +116,7 @@ public class GenerationCommands { break; default: - actor.printError("You must either specify 1 or 2 radius values."); + actor.printError(TranslatableComponent.of("worldedit.cyl.invalid-radius")); return 0; } @@ -123,7 +126,7 @@ public class GenerationCommands { BlockVector3 pos = session.getPlacementPosition(actor); int affected = editSession.makeCylinder(pos, pattern, radiusX, radiusZ, height, !hollow); - actor.print(affected + " block(s) have been created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.cyl.created", affected), TextComponent.of(affected))); return affected; } @@ -173,7 +176,7 @@ public class GenerationCommands { break; default: - actor.printError("You must either specify 1 or 3 radius values."); + actor.printError(TranslatableComponent.of("worldedit.sphere.invalid-radius")); return 0; } @@ -190,7 +193,7 @@ public class GenerationCommands { if (actor instanceof Player) { ((Player) actor).findFreePosition(); } - actor.print(affected + " block(s) have been created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.sphere.created", affected), TextComponent.of(affected))); return affected; } @@ -211,7 +214,7 @@ public class GenerationCommands { worldEdit.checkMaxRadius(size); density /= 100; int affected = editSession.makeForest(session.getPlacementPosition(actor), size, density, type); - actor.print(affected + " trees created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.forestgen.created", affected), TextComponent.of(affected))); return affected; } @@ -226,7 +229,7 @@ public class GenerationCommands { int size) throws WorldEditException { worldEdit.checkMaxRadius(size); int affected = editSession.makePumpkinPatches(session.getPlacementPosition(actor), size); - actor.print(affected + " pumpkin patches created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.pumpkins.created", affected), TextComponent.of(affected))); return affected; } @@ -263,7 +266,7 @@ public class GenerationCommands { if (actor instanceof Player) { ((Player) actor).findFreePosition(); } - actor.print(affected + " block(s) have been created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.pyramid.created", affected), TextComponent.of(affected))); return affected; } @@ -322,10 +325,10 @@ public class GenerationCommands { if (actor instanceof Player) { ((Player) actor).findFreePosition(); } - actor.print(affected + " block(s) have been created."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.generate.created", affected), TextComponent.of(affected))); return affected; } catch (ExpressionException e) { - actor.printError(e.getMessage()); + actor.printError(TextComponent.of(e.getMessage())); return 0; } } @@ -381,10 +384,10 @@ public class GenerationCommands { try { final int affected = editSession.makeBiomeShape(region, zero, unit, target, String.join(" ", expression), hollow, session.getTimeout()); - actor.print("" + affected + " columns affected."); + actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.generatebiome.changed", affected), TextComponent.of(affected))); return affected; } catch (ExpressionException e) { - actor.printError(e.getMessage()); + actor.printError(TextComponent.of(e.getMessage())); return 0; } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java index 19f5ed855..e27e5eca6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java @@ -162,14 +162,12 @@ public class GardenPatchGenerator implements RegionFunction { position = position.add(0, 1, 0); } - if (editSession.getBlock(position.add(0, -1, 0)).getBlockType() != BlockTypes.GRASS_BLOCK) { + if (!editSession.getBlock(position.add(0, -1, 0)).getBlockType().equals(BlockTypes.GRASS_BLOCK)) { return false; } - if (editSession.getBlock(position).getBlockType().getMaterial().isAir()) { - editSession.setBlock(position, leafPattern); - } + setBlockIfAir(editSession, position, leafPattern); placeVine(position, position.add(0, 0, 1)); placeVine(position, position.add(0, 0, -1)); diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index 53e9ec6e5..758f33654 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -192,6 +192,23 @@ "worldedit.up.obstructed": "You would hit something above you.", "worldedit.up.moved": "Woosh!", + "worldedit.cyl.invalid-radius": "You must either specify 1 or 2 radius values.", + "worldedit.cyl.created.singular": "{0} block has been created.", + "worldedit.cyl.created.plural": "{0} blocks have been created.", + "worldedit.sphere.invalid-radius": "You must either specify 1 or 3 radius values.", + "worldedit.sphere.created.singular": "{0} block has been created.", + "worldedit.sphere.created.plural": "{0} blocks have been created.", + "worldedit.forestgen.created.singular": "{0} tree created.", + "worldedit.forestgen.created.plural": "{0} trees created.", + "worldedit.pumpkins.created.singular": "{0} pumpkin patch created.", + "worldedit.pumpkins.created.plural": "{0} pumpkin patches created.", + "worldedit.pyramid.created.singular": "{0} block has been created.", + "worldedit.pyramid.created.plural": "{0} blocks have been created.", + "worldedit.generate.created.singular": "{0} block has been created.", + "worldedit.generate.created.plural": "{0} blocks have been created.", + "worldedit.generate.changed.singular": "{0} column affected.", + "worldedit.generate.changed.plural": "{0} columns affected.", + "worldedit.reload.config": "Configuration reloaded!", "worldedit.report.written": "WorldEdit report written to {0}", "worldedit.report.error": "Failed to write report: {0}", From 0e6037584fd71bc0bf846922fee6e631995f3b68 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 27 Oct 2019 15:29:40 +1000 Subject: [PATCH 05/16] Remove support for pluralisation to match Minecraft and alleviate issues with over-complexity --- .../worldedit/command/BiomeCommands.java | 4 +- .../worldedit/command/ExpandCommands.java | 4 +- .../worldedit/command/GenerationCommands.java | 14 +- .../worldedit/command/NavigationCommands.java | 4 +- .../worldedit/command/RegionCommands.java | 30 ++-- .../worldedit/command/UtilityCommands.java | 31 ++-- .../function/operation/ForwardExtentCopy.java | 6 +- .../function/visitor/BreadthFirstSearch.java | 2 +- .../function/visitor/EntityVisitor.java | 2 +- .../function/visitor/FlatRegionVisitor.java | 2 +- .../function/visitor/RegionVisitor.java | 2 +- .../util/translation/LocalisationHelpers.java | 42 ----- .../src/main/resources/lang/strings.json | 147 ++++++------------ 13 files changed, 99 insertions(+), 191 deletions(-) delete mode 100644 worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/LocalisationHelpers.java diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java index 9b40db6a8..447c8275c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java @@ -167,7 +167,7 @@ public class BiomeCommands { return TextComponent.of(biome.getId()); } }).collect(Collectors.toList()); - player.printInfo(TranslatableComponent.of(pluraliseI18n(messageKey, biomes.size()), TextUtils.join(components, TextComponent.of(", ")))); + player.printInfo(TranslatableComponent.of(messageKey, TextUtils.join(components, TextComponent.of(", ")))); } @Command( @@ -201,7 +201,7 @@ public class BiomeCommands { Operations.completeLegacy(visitor); player.printInfo(TranslatableComponent.of( - pluraliseI18n("worldedit.setbiome.changed", visitor.getAffected()), + "worldedit.setbiome.changed", TextComponent.of(visitor.getAffected()) )); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java index d7e908e53..829766b9d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java @@ -113,7 +113,7 @@ public class ExpandCommands { session.getRegionSelector(player.getWorld()).explainRegionAdjust(player, session); int changeSize = newSize - oldSize; player.printInfo( - TranslatableComponent.of(pluraliseI18n("worldedit.expand.expanded.vert", changeSize), TextComponent.of(changeSize)) + TranslatableComponent.of("worldedit.expand.expanded.vert", TextComponent.of(changeSize)) ); } catch (RegionOperationException e) { player.printError(TextComponent.of(e.getMessage())); @@ -152,7 +152,7 @@ public class ExpandCommands { session.getRegionSelector(world).explainRegionAdjust(actor, session); int changeSize = newSize - oldSize; - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.expand.expanded", changeSize), TextComponent.of(changeSize))); + actor.printInfo(TranslatableComponent.of("worldedit.expand.expanded", TextComponent.of(changeSize))); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java index 92fe2222a..b6a2a3c42 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java @@ -126,7 +126,7 @@ public class GenerationCommands { BlockVector3 pos = session.getPlacementPosition(actor); int affected = editSession.makeCylinder(pos, pattern, radiusX, radiusZ, height, !hollow); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.cyl.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.cyl.created", TextComponent.of(affected))); return affected; } @@ -193,7 +193,7 @@ public class GenerationCommands { if (actor instanceof Player) { ((Player) actor).findFreePosition(); } - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.sphere.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.sphere.created", TextComponent.of(affected))); return affected; } @@ -214,7 +214,7 @@ public class GenerationCommands { worldEdit.checkMaxRadius(size); density /= 100; int affected = editSession.makeForest(session.getPlacementPosition(actor), size, density, type); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.forestgen.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.forestgen.created", TextComponent.of(affected))); return affected; } @@ -229,7 +229,7 @@ public class GenerationCommands { int size) throws WorldEditException { worldEdit.checkMaxRadius(size); int affected = editSession.makePumpkinPatches(session.getPlacementPosition(actor), size); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.pumpkins.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.pumpkins.created", TextComponent.of(affected))); return affected; } @@ -266,7 +266,7 @@ public class GenerationCommands { if (actor instanceof Player) { ((Player) actor).findFreePosition(); } - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.pyramid.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.pyramid.created", TextComponent.of(affected))); return affected; } @@ -325,7 +325,7 @@ public class GenerationCommands { if (actor instanceof Player) { ((Player) actor).findFreePosition(); } - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.generate.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.generate.created", TextComponent.of(affected))); return affected; } catch (ExpressionException e) { actor.printError(TextComponent.of(e.getMessage())); @@ -384,7 +384,7 @@ public class GenerationCommands { try { final int affected = editSession.makeBiomeShape(region, zero, unit, target, String.join(" ", expression), hollow, session.getTimeout()); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.generatebiome.changed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.generatebiome.changed", TextComponent.of(affected))); return affected; } catch (ExpressionException e) { actor.printError(TextComponent.of(e.getMessage())); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java index e168389b9..f1a815b39 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java @@ -86,7 +86,7 @@ public class NavigationCommands { if (ascentLevels == 0) { player.printError(TranslatableComponent.of("worldedit.ascend.obstructed")); } else { - player.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.ascend.moved", ascentLevels), TextComponent.of(ascentLevels))); + player.printInfo(TranslatableComponent.of("worldedit.ascend.moved", TextComponent.of(ascentLevels))); } } @@ -109,7 +109,7 @@ public class NavigationCommands { if (descentLevels == 0) { player.printError(TranslatableComponent.of("worldedit.descend.obstructed")); } else { - player.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.descend.moved", descentLevels), TextComponent.of(descentLevels))); + player.printInfo(TranslatableComponent.of("worldedit.descend.moved", TextComponent.of(descentLevels))); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java index 59584a1e8..6d59e128f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java @@ -139,7 +139,7 @@ public class RegionCommands { BlockVector3 pos2 = cuboidregion.getPos2(); int blocksChanged = editSession.drawLine(pattern, pos1, pos2, thickness, !shell); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.line.changed", blocksChanged), TextComponent.of(blocksChanged))); + actor.printInfo(TranslatableComponent.of("worldedit.line.changed", TextComponent.of(blocksChanged))); return blocksChanged; } @@ -169,7 +169,7 @@ public class RegionCommands { int blocksChanged = editSession.drawSpline(pattern, vectors, 0, 0, 0, 10, thickness, !shell); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.curve.changed", blocksChanged), TextComponent.of(blocksChanged))); + actor.printInfo(TranslatableComponent.of("worldedit.curve.changed", TextComponent.of(blocksChanged))); return blocksChanged; } @@ -189,7 +189,7 @@ public class RegionCommands { from = new ExistingBlockMask(editSession); } int affected = editSession.replaceBlocks(region, from, to); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.replace.replaced", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.replace.replaced", TextComponent.of(affected))); return affected; } @@ -203,7 +203,7 @@ public class RegionCommands { @Arg(desc = "The pattern of blocks to overlay") Pattern pattern) throws WorldEditException { int affected = editSession.overlayCuboidBlocks(region, pattern); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.overlay.overlaid", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.overlay.overlaid", TextComponent.of(affected))); return affected; } @@ -218,7 +218,7 @@ public class RegionCommands { @Arg(desc = "The pattern of blocks to set") Pattern pattern) throws WorldEditException { int affected = editSession.center(region, pattern); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.center.changed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.center.changed", TextComponent.of(affected))); return affected; } @@ -230,7 +230,7 @@ public class RegionCommands { @Logging(REGION) public int naturalize(Actor actor, EditSession editSession, @Selection Region region) throws WorldEditException { int affected = editSession.naturalizeCuboidBlocks(region); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.naturalize.naturalized", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.naturalize.naturalized", TextComponent.of(affected))); return affected; } @@ -244,7 +244,7 @@ public class RegionCommands { @Arg(desc = "The pattern of blocks to set") Pattern pattern) throws WorldEditException { int affected = editSession.makeWalls(region, pattern); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.walls.changed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.walls.changed", TextComponent.of(affected))); return affected; } @@ -259,7 +259,7 @@ public class RegionCommands { @Arg(desc = "The pattern of blocks to set") Pattern pattern) throws WorldEditException { int affected = editSession.makeCuboidFaces(region, pattern); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.faces.changed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.faces.changed", TextComponent.of(affected))); return affected; } @@ -278,7 +278,7 @@ public class RegionCommands { HeightMap heightMap = new HeightMap(editSession, region, mask); HeightMapFilter filter = new HeightMapFilter(new GaussianKernel(5, 1.0)); int affected = heightMap.applyFilter(filter, iterations); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.smooth.changed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.smooth.changed", TextComponent.of(affected))); return affected; } @@ -333,7 +333,7 @@ public class RegionCommands { } } - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.move.moved", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.move.moved", TextComponent.of(affected))); return affected; } @@ -388,7 +388,7 @@ public class RegionCommands { } } - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.stack.changed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.stack.changed", TextComponent.of(affected))); return affected; } @@ -455,7 +455,7 @@ public class RegionCommands { if (actor instanceof Player) { ((Player) actor).findFreePosition(); } - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.deform.deformed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.deform.deformed", TextComponent.of(affected))); return affected; } catch (ExpressionException e) { actor.printError(TextComponent.of(e.getMessage())); @@ -479,7 +479,7 @@ public class RegionCommands { checkCommandArgument(thickness >= 0, "Thickness must be >= 0"); int affected = editSession.hollowOutRegion(region, thickness, pattern); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.hollow.changed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.hollow.changed", TextComponent.of(affected))); return affected; } @@ -496,7 +496,7 @@ public class RegionCommands { double density) throws WorldEditException { checkCommandArgument(0 <= density && density <= 100, "Density must be in [0, 100]"); int affected = editSession.makeForest(region, density / 100, type); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.forest.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.forest.created", TextComponent.of(affected))); return affected; } @@ -518,7 +518,7 @@ public class RegionCommands { Operations.completeLegacy(visitor); int affected = ground.getAffected(); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.flora.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.flora.created", TextComponent.of(affected))); return affected; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java index 1252a12c6..d3eb84ea2 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java @@ -20,7 +20,6 @@ package com.sk89q.worldedit.command; import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.IncompleteRegionException; @@ -101,7 +100,7 @@ public class UtilityCommands { BlockVector3 pos = session.getPlacementPosition(actor); int affected = editSession.fillXZ(pos, pattern, radius, depth, false); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.fill.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.fill.created", TextComponent.of(affected))); return affected; } @@ -125,7 +124,7 @@ public class UtilityCommands { BlockVector3 pos = session.getPlacementPosition(actor); int affected = editSession.fillXZ(pos, pattern, radius, depth, true); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.fillr.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.fillr.created", TextComponent.of(affected))); return affected; } @@ -143,7 +142,7 @@ public class UtilityCommands { radius = Math.max(0, radius); we.checkMaxRadius(radius); int affected = editSession.drainArea(session.getPlacementPosition(actor), radius, waterlogged); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.drain.drained", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.drain.drained", TextComponent.of(affected))); return affected; } @@ -160,7 +159,7 @@ public class UtilityCommands { radius = Math.max(0, radius); we.checkMaxRadius(radius); int affected = editSession.fixLiquid(session.getPlacementPosition(actor), radius, BlockTypes.LAVA); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.fixlava.fixed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.fixlava.fixed", TextComponent.of(affected))); return affected; } @@ -177,7 +176,7 @@ public class UtilityCommands { radius = Math.max(0, radius); we.checkMaxRadius(radius); int affected = editSession.fixLiquid(session.getPlacementPosition(actor), radius, BlockTypes.WATER); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.fixwater.fixed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.fixwater.fixed", TextComponent.of(affected))); return affected; } @@ -198,7 +197,7 @@ public class UtilityCommands { height = height != null ? Math.min((world.getMaxY() + 1), height + 1) : (world.getMaxY() + 1); int affected = editSession.removeAbove(session.getPlacementPosition(actor), size, height); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.removeabove.removed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.removeabove.removed", TextComponent.of(affected))); return affected; } @@ -219,7 +218,7 @@ public class UtilityCommands { height = height != null ? Math.min((world.getMaxY() + 1), height + 1) : (world.getMaxY() + 1); int affected = editSession.removeBelow(session.getPlacementPosition(actor), size, height); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.removebelow.removed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.removebelow.removed", TextComponent.of(affected))); return affected; } @@ -239,7 +238,7 @@ public class UtilityCommands { we.checkMaxRadius(radius); int affected = editSession.removeNear(session.getPlacementPosition(actor), mask, radius); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.removenear.removed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.removenear.removed", TextComponent.of(affected))); return affected; } @@ -270,7 +269,7 @@ public class UtilityCommands { } int affected = editSession.replaceBlocks(region, from, to); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.replacenear.replaced", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.replacenear.replaced", TextComponent.of(affected))); return affected; } @@ -288,7 +287,7 @@ public class UtilityCommands { we.checkMaxRadius(size); int affected = editSession.simulateSnow(session.getPlacementPosition(actor), size); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.snow.created", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.snow.created", TextComponent.of(affected))); return affected; } @@ -306,7 +305,7 @@ public class UtilityCommands { we.checkMaxRadius(size); int affected = editSession.thaw(session.getPlacementPosition(actor), size); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.thaw.removed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.thaw.removed", TextComponent.of(affected))); return affected; } @@ -327,7 +326,7 @@ public class UtilityCommands { final boolean onlyNormalDirt = !convertCoarse; final int affected = editSession.green(session.getPlacementPosition(actor), size, onlyNormalDirt); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.green.changed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.green.changed", TextComponent.of(affected))); return affected; } @@ -350,7 +349,7 @@ public class UtilityCommands { Mask mask = new BlockTypeMask(editSession, BlockTypes.FIRE); int affected = editSession.removeNear(session.getPlacementPosition(actor), mask, size); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.extinguish.removed", affected), TextComponent.of(affected))); + actor.printInfo(TranslatableComponent.of("worldedit.extinguish.removed", TextComponent.of(affected))); return affected; } @@ -408,7 +407,7 @@ public class UtilityCommands { int killed = killMatchingEntities(radius, actor, flags::createFunction); actor.printInfo(TranslatableComponent.of( - pluraliseI18n("worldedit.butcher.killed", killed), + "worldedit.butcher.killed", TextComponent.of(killed), TextComponent.of(radius) )); @@ -434,7 +433,7 @@ public class UtilityCommands { } int removed = killMatchingEntities(radius, actor, remover::createFunction); - actor.printInfo(TranslatableComponent.of(pluraliseI18n("worldedit.remove.removed", removed), TextComponent.of(removed))); + actor.printInfo(TranslatableComponent.of("worldedit.remove.removed", TextComponent.of(removed))); return removed; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java index ddc35e107..a08507e03 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java @@ -345,11 +345,11 @@ public class ForwardExtentCopy implements Operation { @Override public Iterable getStatusMessages() { List messages = new ArrayList<>(); - messages.add(TranslatableComponent.of(pluraliseI18n("worldedit.operation.affected.block", affectedBlocks), + messages.add(TranslatableComponent.of("worldedit.operation.affected.block", TextComponent.of(affectedBlocks)).color(TextColor.LIGHT_PURPLE)); - messages.add(TranslatableComponent.of(pluraliseI18n("worldedit.operation.affected.biome", affectedBiomeCols), + messages.add(TranslatableComponent.of("worldedit.operation.affected.biome", TextComponent.of(affectedBiomeCols)).color(TextColor.LIGHT_PURPLE)); - messages.add(TranslatableComponent.of(pluraliseI18n("worldedit.operation.affected.entity", affectedEntities), + messages.add(TranslatableComponent.of("worldedit.operation.affected.entity", TextComponent.of(affectedEntities)).color(TextColor.LIGHT_PURPLE)); return messages; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java index 9d4144d3f..e32ec54d9 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java @@ -189,7 +189,7 @@ public abstract class BreadthFirstSearch implements Operation { @Override public Iterable getStatusMessages() { return Lists.newArrayList(TranslatableComponent.of( - pluraliseI18n("worldedit.operation.affected.block", getAffected()), + "worldedit.operation.affected.block", TextComponent.of(getAffected()) ).color(TextColor.LIGHT_PURPLE)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java index 719fa3e60..b8e9cb99f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java @@ -86,7 +86,7 @@ public class EntityVisitor implements Operation { @Override public Iterable getStatusMessages() { return Lists.newArrayList(TranslatableComponent.of( - pluraliseI18n("worldedit.operation.affected.entity", getAffected()), + "worldedit.operation.affected.entity", TextComponent.of(getAffected()) ).color(TextColor.LIGHT_PURPLE)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java index e7b0daa57..70d3c9df0 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java @@ -87,7 +87,7 @@ public class FlatRegionVisitor implements Operation { @Override public Iterable getStatusMessages() { return Lists.newArrayList(TranslatableComponent.of( - pluraliseI18n("worldedit.operation.affected.column", getAffected()), + "worldedit.operation.affected.column", TextComponent.of(getAffected()) ).color(TextColor.LIGHT_PURPLE)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java index 4f595584b..a7070e1c4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java @@ -74,7 +74,7 @@ public class RegionVisitor implements Operation { @Override public Iterable getStatusMessages() { return Lists.newArrayList(TranslatableComponent.of( - pluraliseI18n("worldedit.operation.affected.block", getAffected()), + "worldedit.operation.affected.block", TextComponent.of(getAffected()) ).color(TextColor.LIGHT_PURPLE)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/LocalisationHelpers.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/LocalisationHelpers.java deleted file mode 100644 index 7909076b5..000000000 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/LocalisationHelpers.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * WorldEdit, a Minecraft world manipulation toolkit - * Copyright (C) sk89q - * Copyright (C) WorldEdit team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldedit.util.translation; - -public class LocalisationHelpers { - - private LocalisationHelpers() { - } - - /** - * Turn a translation key into a ".singular" or ".plural" - * depending on what the given number is. - * - * @param translationKey The base translation key - * @param number The number - * @return The key with .plural or .singular appended - */ - public static String pluraliseI18n(String translationKey, float number) { - if (number == 1) { - return translationKey + ".singular"; - } else { - return translationKey + ".plural"; - } - } -} diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index 758f33654..341c5a2ee 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -1,16 +1,11 @@ { "worldedit.expand.description.vert": "Vertically expand the selection to world limits.", - "worldedit.expand.expanded.singular": "Region expanded {0} block", - "worldedit.expand.expanded.plural": "Region expanded {0} blocks", - "worldedit.expand.expanded.vert.singular": "Region expanded {0} block (top-to-bottom).", - "worldedit.expand.expanded.vert.plural": "Region expanded {0} blocks (top-to-bottom).", + "worldedit.expand.expanded": "Region expanded {0} blocks", + "worldedit.expand.expanded.vert": "Region expanded {0} blocks (top-to-bottom).", - "worldedit.biomeinfo.lineofsight.singular": "Biome at line of sight point: {0}", - "worldedit.biomeinfo.lineofsight.plural": "Biomes at line of sight point: {0}", - "worldedit.biomeinfo.position.singular": "Biome at your position: {0}", - "worldedit.biomeinfo.position.plural": "Biomes at your position: {0}", - "worldedit.biomeinfo.selection.singular": "Biome in your selection: {0}", - "worldedit.biomeinfo.selection.plural": "Biomes in your selection: {0}", + "worldedit.biomeinfo.lineofsight": "Biomes at line of sight point: {0}", + "worldedit.biomeinfo.position": "Biomes at your position: {0}", + "worldedit.biomeinfo.selection": "Biomes in your selection: {0}", "worldedit.bruch.radius-too-large": "Maximum allowed brush radius: {0}", "worldedit.brush.apply.description": "Apply brush, apply a function to every block", @@ -34,8 +29,7 @@ "worldedit.brush.operation.equip": "Set brush to {0}.", "worldedit.brush.none.equip": "Brush unbound from your current item.", - "worldedit.setbiome.changed.singular": "Biomes were changed in {0} column. You may have to rejoin your game (or close and reopen your world) to see a change.", - "worldedit.setbiome.changed.plural": "Biomes were changed in {0} columns. You may have to rejoin your game (or close and reopen your world) to see a change.", + "worldedit.setbiome.changed": "Biomes were changed in {0} columns. You may have to rejoin your game (or close and reopen your world) to see a change.", "worldedit.drawsel.disabled": "Server CUI disabled.", "worldedit.drawsel.enabled": "Server CUI enabled. This only supports cuboid regions, with a maximum size of 32x32x32.", @@ -99,37 +93,22 @@ "worldedit.schematic.delete.deleted": "{0} has been deleted.", "worldedit.schematic.formats.title": "Available clipboard formats (Name: Lookup names)", - "worldedit.drain.drained.singular": "{0} block has been drained.", - "worldedit.drain.drained.plural": "{0} blocks have been drained.", - "worldedit.fill.created.singular": "{0} block has been filled.", - "worldedit.fill.created.plural": "{0} blocks have been filled.", - "worldedit.fillr.created.singular": "{0} block has been filled.", - "worldedit.fillr.created.plural": "{0} blocks have been filled.", - "worldedit.fixlava.fixed.singular": "{0} block has been fixed.", - "worldedit.fixlava.fixed.plural": "{0} blocks have been fixed.", - "worldedit.fixwater.fixed.singular": "{0} block has been fixed.", - "worldedit.fixwater.fixed.plural": "{0} blocks have been fixed.", - "worldedit.removeabove.removed.singular": "{0} block has been removed.", - "worldedit.removeabove.removed.plural": "{0} blocks have been removed.", - "worldedit.removebelow.removed.singular": "{0} block has been removed.", - "worldedit.removebelow.removed.plural": "{0} blocks have been removed.", - "worldedit.removenear.removed.singular": "{0} block has been removed.", - "worldedit.removenear.removed.plural": "{0} blocks have been removed.", - "worldedit.replacenear.replaced.singular": "{0} block has been replaced.", - "worldedit.replacenear.replaced.plural": "{0} blocks have been replaced.", - "worldedit.snow.created.singular": "{0} surface has been covered.", - "worldedit.snow.created.plural": "{0} surfaces have been covered.", - "worldedit.thaw.removed.singular": "{0} block has been thawed.", - "worldedit.thaw.removed.plural": "{0} blocks have been thawed.", - "worldedit.green.changed.singular": "{0} block has been greened.", - "worldedit.green.changed.plural": "{0} blocks have been greened.", - "worldedit.extinguish.removed.singular": "{0} fire has been extinguished.", - "worldedit.extinguish.removed.plural": "{0} fires have been extinguished.", - "worldedit.butcher.killed.singular": "{0} mob has been killed in a radius of {1}.", - "worldedit.butcher.killed.plural": "{0} mobs have been killed in a radius of {1}.", + "worldedit.drain.drained": "{0} blocks have been drained.", + "worldedit.fill.created": "{0} blocks have been filled.", + "worldedit.fillr.created": "{0} blocks have been filled.", + "worldedit.fixlava.fixed": "{0} blocks have been fixed.", + "worldedit.fixwater.fixed": "{0} blocks have been fixed.", + "worldedit.removeabove.removed": "{0} blocks have been removed.", + "worldedit.removebelow.removed": "{0} blocks have been removed.", + "worldedit.removenear.removed": "{0} blocks have been removed.", + "worldedit.replacenear.replaced": "{0} blocks have been replaced.", + "worldedit.snow.created": "{0} surfaces have been covered.", + "worldedit.thaw.removed": "{0} blocks have been thawed.", + "worldedit.green.changed": "{0} blocks have been greened.", + "worldedit.extinguish.removed": "{0} fires have been extinguished.", + "worldedit.butcher.killed": "{0} mobs have been killed in a radius of {1}.", "worldedit.butcher.explain-all": "Use -1 to remove all mobs in loaded chunks", - "worldedit.remove.removed.singular": "{0} entity has been marked for removal.", - "worldedit.remove.removed.plural": "{0} entities have been marked for removal.", + "worldedit.remove.removed": "{0} entities have been marked for removal.", "worldedit.remove.explain-all": "Use -1 to remove all entities in loaded chunks", "worldedit.calc.invalid": "'{0}' could not be parsed as a valid expression", @@ -142,47 +121,30 @@ "worldedit.set.done": "Operation completed.", "worldedit.set.done.verbose": "Operation completed ({0}).", - "worldedit.line.changed.singular": "{0} block has been changed.", - "worldedit.line.changed.plural": "{0} blocks have been changed.", + "worldedit.line.changed": "{0} blocks have been changed.", "worldedit.line.cuboid-only": "//line only works with cuboid selections", - "worldedit.curve.changed.singular": "{0} block has been changed.", - "worldedit.curve.changed.plural": "{0} blocks have been changed.", + "worldedit.curve.changed": "{0} blocks have been changed.", "worldedit.curve.convex-only": "//curve only works with convex polyhedral selections", - "worldedit.replace.replaced.singular": "{0} block has been replaced.", - "worldedit.replace.replaced.plural": "{0} blocks have been replaced.", - "worldedit.stack.changed.singular": "{0} block changed. Undo with //undo", - "worldedit.stack.changed.plural": "{0} blocks changed. Undo with //undo", + "worldedit.replace.replaced": "{0} blocks have been replaced.", + "worldedit.stack.changed": "{0} blocks changed. Undo with //undo", "worldedit.regen.regenerated": "Region regenerated.", - "worldedit.walls.changed.singular": "{0} block has been changed.", - "worldedit.walls.changed.plural": "{0} blocks have been changed.", - "worldedit.faces.changed.singular": "{0} block has been changed.", - "worldedit.faces.changed.plural": "{0} blocks have been changed.", - "worldedit.overlay.overlaid.singular": "{0} block has been overlaid.", - "worldedit.overlay.overlaid.plural": "{0} blocks have been overlaid.", - "worldedit.naturalize.naturalized.singular": "{0} block has been made to look more natural.", - "worldedit.naturalize.naturalized.plural": "{0} block(s) have been made to look more natural.", - "worldedit.center.changed.singular": "Center set. ({0} block changed)", - "worldedit.center.changed.plural": "Center set. ({0} blocks changed)", - "worldedit.smooth.changed.singular": "Terrain's height map smoothed. {0} block changed.", - "worldedit.smooth.changed.plural": "Terrain's height map smoothed. {0} blocks changed.", - "worldedit.move.moved.singular": "{0} block moved.", - "worldedit.move.moved.plural": "{0} blocks moved.", - "worldedit.deform.deformed.singular": "{0} block has been deformed.", - "worldedit.deform.deformed.plural": "{0} blocks have been deformed.", - "worldedit.hollow.changed.singular": "{0} block has been changed.", - "worldedit.hollow.changed.plural": "{0} blocks have been changed.", - "worldedit.forest.created.singular": "{0} tree created.", - "worldedit.forest.created.plural": "{0} trees created.", - "worldedit.flora.created.singular": "{0} flora created.", - "worldedit.flora.created.plural": "{0} flora created.", + "worldedit.walls.changed": "{0} blocks have been changed.", + "worldedit.faces.changed": "{0} blocks have been changed.", + "worldedit.overlay.overlaid": "{0} blocks have been overlaid.", + "worldedit.naturalize.naturalized": "{0} block(s) have been made to look more natural.", + "worldedit.center.changed": "Center set. ({0} blocks changed)", + "worldedit.smooth.changed": "Terrain's height map smoothed. {0} blocks changed.", + "worldedit.move.moved": "{0} blocks moved.", + "worldedit.deform.deformed": "{0} blocks have been deformed.", + "worldedit.hollow.changed": "{0} blocks have been changed.", + "worldedit.forest.created": "{0} trees created.", + "worldedit.flora.created": "{0} flora created.", "worldedit.unstuck.moved": "There you go!", "worldedit.ascend.obstructed": "No free spot above you found.", - "worldedit.ascend.moved.singular": "Ascended a level.", - "worldedit.ascend.moved.plural": "Ascended {0} levels.", + "worldedit.ascend.moved": "Ascended {0} levels.", "worldedit.descend.obstructed": "No free spot below you found.", - "worldedit.descend.moved.singular": "Descended a level.", - "worldedit.descend.moved.plural": "Descended {0} levels.", + "worldedit.descend.moved": "Descended {0} levels.", "worldedit.ceil.obstructed": "No free spot above you found.", "worldedit.ceil.moved": "Woosh!", "worldedit.thru.obstructed": "No free spot ahead of you found.", @@ -193,21 +155,14 @@ "worldedit.up.moved": "Woosh!", "worldedit.cyl.invalid-radius": "You must either specify 1 or 2 radius values.", - "worldedit.cyl.created.singular": "{0} block has been created.", - "worldedit.cyl.created.plural": "{0} blocks have been created.", + "worldedit.cyl.created": "{0} blocks have been created.", "worldedit.sphere.invalid-radius": "You must either specify 1 or 3 radius values.", - "worldedit.sphere.created.singular": "{0} block has been created.", - "worldedit.sphere.created.plural": "{0} blocks have been created.", - "worldedit.forestgen.created.singular": "{0} tree created.", - "worldedit.forestgen.created.plural": "{0} trees created.", - "worldedit.pumpkins.created.singular": "{0} pumpkin patch created.", - "worldedit.pumpkins.created.plural": "{0} pumpkin patches created.", - "worldedit.pyramid.created.singular": "{0} block has been created.", - "worldedit.pyramid.created.plural": "{0} blocks have been created.", - "worldedit.generate.created.singular": "{0} block has been created.", - "worldedit.generate.created.plural": "{0} blocks have been created.", - "worldedit.generate.changed.singular": "{0} column affected.", - "worldedit.generate.changed.plural": "{0} columns affected.", + "worldedit.sphere.created": "{0} blocks have been created.", + "worldedit.forestgen.created": "{0} trees created.", + "worldedit.pumpkins.created": "{0} pumpkin patches created.", + "worldedit.pyramid.created": "{0} blocks have been created.", + "worldedit.generate.created": "{0} blocks have been created.", + "worldedit.generate.changed": "{0} columns affected.", "worldedit.reload.config": "Configuration reloaded!", "worldedit.report.written": "WorldEdit report written to {0}", @@ -253,14 +208,10 @@ "worldedit.superpickaxe.mode.recursive": "Mode is now recursive. Left click with a pickaxe. // to disable.", "worldedit.superpickaxe.max-range": "Maximum range is {0}.", - "worldedit.operation.affected.biome.singular": "{0} biome affected", - "worldedit.operation.affected.biome.plural": "{0} biomes affected", - "worldedit.operation.affected.block.singular": "{0} block affected", - "worldedit.operation.affected.block.plural": "{0} blocks affected", - "worldedit.operation.affected.column.singular": "{0} column affected", - "worldedit.operation.affected.column.plural": "{0} columns affected", - "worldedit.operation.affected.entity.singular": "{0} entity affected", - "worldedit.operation.affected.entity.plural": "{0} entities affected", + "worldedit.operation.affected.biome": "{0} biomes affected", + "worldedit.operation.affected.block": "{0} blocks affected", + "worldedit.operation.affected.column": "{0} columns affected", + "worldedit.operation.affected.entity": "{0} entities affected", "worldedit.operation.deform.expression": "deformed using {0}", "worldedit.help.command-not-found": "The command '{0}' could not be found." From 4ba54c433705780ca0a3ec1a9de71ba000ef4a63 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 27 Oct 2019 17:19:30 +1000 Subject: [PATCH 06/16] Further translations --- .../worldedit/command/BiomeCommands.java | 1 - .../worldedit/command/ExpandCommands.java | 1 - .../worldedit/command/GeneralCommands.java | 4 +- .../worldedit/command/GenerationCommands.java | 1 - .../worldedit/command/NavigationCommands.java | 1 - .../worldedit/command/RegionCommands.java | 1 - .../worldedit/command/SelectionCommands.java | 109 +++++++++--------- .../command/SuperPickaxeCommands.java | 6 +- .../sk89q/worldedit/command/ToolCommands.java | 2 +- .../worldedit/command/ToolUtilCommands.java | 21 ++-- .../command/util/PrintCommandHelp.java | 17 ++- .../platform/AbstractPlayerActor.java | 1 - .../function/operation/ForwardExtentCopy.java | 1 - .../function/visitor/BreadthFirstSearch.java | 1 - .../function/visitor/EntityVisitor.java | 3 - .../function/visitor/FlatRegionVisitor.java | 4 - .../function/visitor/RegionVisitor.java | 2 - .../formatting/component/CommandListBox.java | 1 + .../util/translation/TranslationManager.java | 1 - .../src/main/resources/lang/strings.json | 72 ++++++++++-- 20 files changed, 146 insertions(+), 104 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java index 447c8275c..a04cbeeb4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java @@ -66,7 +66,6 @@ import java.util.Set; import java.util.stream.Collectors; import static com.sk89q.worldedit.command.util.Logging.LogMode.REGION; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Implements biome-related commands such as "/biomelist". diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java index 829766b9d..bc93624e2 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ExpandCommands.java @@ -48,7 +48,6 @@ import java.util.List; import static com.sk89q.worldedit.command.util.Logging.LogMode.REGION; import static com.sk89q.worldedit.internal.command.CommandUtil.requireIV; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Extracted from {@link SelectionCommands} to allow importing of {@link Command}. diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java index 38f66b71a..82bd2c8f4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java @@ -225,11 +225,11 @@ public class GeneralCommands { } boolean previousMode = session.isTickingWatchdog(); if (hookMode != null && (hookMode == HookMode.ACTIVE) == previousMode) { - actor.printError(TranslatableComponent.of(previousMode ? "worldedit.watchdog.already-active" : "worldedit.watchdog.already-inactive")); + actor.printError(TranslatableComponent.of(previousMode ? "worldedit.watchdog.active.already" : "worldedit.watchdog.inactive.already")); return; } session.setTickingWatchdog(!previousMode); - actor.printInfo(TranslatableComponent.of(previousMode ? "worldedit.watchdog.now-inactive" : "worldedit.watchdog.now-active")); + actor.printInfo(TranslatableComponent.of(previousMode ? "worldedit.watchdog.inactive" : "worldedit.watchdog.active")); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java index b6a2a3c42..ecad75352 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java @@ -51,7 +51,6 @@ import static com.sk89q.worldedit.command.util.Logging.LogMode.ALL; import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT; import static com.sk89q.worldedit.command.util.Logging.LogMode.POSITION; import static com.sk89q.worldedit.internal.command.CommandUtil.checkCommandArgument; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Commands for the generation of shapes and other objects. diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java index f1a815b39..7b514b951 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java @@ -36,7 +36,6 @@ import org.enginehub.piston.annotation.param.Switch; import static com.google.common.base.Preconditions.checkNotNull; import static com.sk89q.worldedit.command.util.Logging.LogMode.POSITION; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Commands for moving the player around. diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java index 6d59e128f..b3f0a6d1e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java @@ -75,7 +75,6 @@ import static com.sk89q.worldedit.internal.command.CommandUtil.checkCommandArgum import static com.sk89q.worldedit.regions.Regions.asFlatRegion; import static com.sk89q.worldedit.regions.Regions.maximumBlockY; import static com.sk89q.worldedit.regions.Regions.minimumBlockY; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; /** * Commands that operate on regions. diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java index 5cf8dc676..6b3bdc515 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java @@ -66,6 +66,7 @@ import com.sk89q.worldedit.util.formatting.component.SubtleFormat; import com.sk89q.worldedit.util.formatting.component.TextComponentProducer; import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.event.ClickEvent; import com.sk89q.worldedit.util.formatting.text.event.HoverEvent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; @@ -116,12 +117,12 @@ public class SelectionCommands { } else if (actor instanceof Locatable) { pos = ((Locatable) actor).getBlockLocation(); } else { - actor.printError("You must provide coordinates as console."); + actor.printError(TranslatableComponent.of("worldedit.pos.console-require-coords")); return; } if (!session.getRegionSelector(world).selectPrimary(pos.toVector().toBlockPoint(), ActorSelectorLimits.forActor(actor))) { - actor.printError("Position already set."); + actor.printError(TranslatableComponent.of("worldedit.pos.already-set")); return; } @@ -144,12 +145,12 @@ public class SelectionCommands { } else if (actor instanceof Locatable) { pos = ((Locatable) actor).getBlockLocation(); } else { - actor.printError("You must provide coordinates as console."); + actor.printError(TranslatableComponent.of("worldedit.pos.console-require-coords")); return; } if (!session.getRegionSelector(world).selectSecondary(pos.toVector().toBlockPoint(), ActorSelectorLimits.forActor(actor))) { - actor.printError("Position already set."); + actor.printError(TranslatableComponent.of("worldedit.pos.already-set")); return; } @@ -168,14 +169,14 @@ public class SelectionCommands { if (pos != null) { if (!session.getRegionSelector(player.getWorld()).selectPrimary(pos.toVector().toBlockPoint(), ActorSelectorLimits.forActor(player))) { - player.printError("Position already set."); + player.printError(TranslatableComponent.of("worldedit.hpos.already-set")); return; } session.getRegionSelector(player.getWorld()) .explainPrimarySelection(player, session, pos.toVector().toBlockPoint()); } else { - player.printError("No block in sight!"); + player.printError(TranslatableComponent.of("worldedit.hpos.no-block")); } } @@ -190,14 +191,14 @@ public class SelectionCommands { if (pos != null) { if (!session.getRegionSelector(player.getWorld()).selectSecondary(pos.toVector().toBlockPoint(), ActorSelectorLimits.forActor(player))) { - player.printError("Position already set."); + player.printError(TranslatableComponent.of("worldedit.hpos.already-set")); return; } session.getRegionSelector(player.getWorld()) .explainSecondarySelection(player, session, pos.toVector().toBlockPoint()); } else { - player.printError("No block in sight!"); + player.printError(TranslatableComponent.of("worldedit.hpos.no-block")); } } @@ -225,9 +226,13 @@ public class SelectionCommands { min = BlockVector3.at(min2D.getBlockX() * 16, 0, min2D.getBlockZ() * 16); max = BlockVector3.at(max2D.getBlockX() * 16 + 15, world.getMaxY(), max2D.getBlockZ() * 16 + 15); - actor.print("Chunks selected: (" - + min2D.getBlockX() + ", " + min2D.getBlockZ() + ") - (" - + max2D.getBlockX() + ", " + max2D.getBlockZ() + ")"); + actor.printInfo(TranslatableComponent.of( + "worldedit.chunk.selected-multiple", + TextComponent.of(min2D.getBlockX()), + TextComponent.of(min2D.getBlockZ()), + TextComponent.of(max2D.getBlockX()), + TextComponent.of(max2D.getBlockZ()) + )); } else { final BlockVector2 min2D; if (coordinates != null) { @@ -247,8 +252,8 @@ public class SelectionCommands { min = BlockVector3.at(min2D.getBlockX() * 16, 0, min2D.getBlockZ() * 16); max = min.add(15, world.getMaxY(), 15); - actor.print("Chunk selected: " - + min2D.getBlockX() + ", " + min2D.getBlockZ()); + actor.printInfo(TranslatableComponent.of("worldedit.chunk.selected", TextComponent.of(min2D.getBlockX()), + TextComponent.of(min2D.getBlockZ()))); } final CuboidRegionSelector selector; @@ -278,16 +283,16 @@ public class SelectionCommands { } ItemType itemType = ItemTypes.get(wandId); if (itemType == null) { - player.printError("Wand item is mis-configured or disabled."); + player.printError(TranslatableComponent.of("worldedit.wand.invalid")); return; } player.giveItem(new BaseItemStack(itemType, 1)); if (navWand) { session.setTool(itemType, new NavigationWand()); - player.print("Left click: jump to location; Right click: pass through walls"); + player.printInfo(TranslatableComponent.of("worldedit.wand.navwand.info")); } else { session.setTool(itemType, new SelectionWand()); - player.print("Left click: select pos #1; Right click: select pos #2"); + player.printInfo(TranslatableComponent.of("worldedit.wand.selwand.info")); } } @@ -339,9 +344,9 @@ public class SelectionCommands { session.getRegionSelector(world).explainRegionAdjust(actor, session); - actor.print("Region contracted " + (oldSize - newSize) + " blocks."); + actor.printInfo(TranslatableComponent.of("worldedit.contract.contracted", TextComponent.of(oldSize - newSize))); } catch (RegionOperationException e) { - actor.printError(e.getMessage()); + actor.printError(TextComponent.of(e.getMessage())); } } @@ -368,9 +373,9 @@ public class SelectionCommands { session.getRegionSelector(world).explainRegionAdjust(actor, session); - actor.print("Region shifted."); + actor.print(TranslatableComponent.of("worldedit.shift.shifted")); } catch (RegionOperationException e) { - actor.printError(e.getMessage()); + actor.printError(TextComponent.of(e.getMessage())); } } @@ -391,7 +396,7 @@ public class SelectionCommands { region.expand(getChangesForEachDir(amount, onlyHorizontal, onlyVertical)); session.getRegionSelector(world).learnChanges(); session.getRegionSelector(world).explainRegionAdjust(actor, session); - actor.print("Region outset."); + actor.print(TranslatableComponent.of("worldedit.outset.outset")); } @Command( @@ -411,7 +416,7 @@ public class SelectionCommands { region.contract(getChangesForEachDir(amount, onlyHorizontal, onlyVertical)); session.getRegionSelector(world).learnChanges(); session.getRegionSelector(world).explainRegionAdjust(actor, session); - actor.print("Region inset."); + actor.print(TranslatableComponent.of("worldedit.inset.inset")); } private BlockVector3[] getChangesForEachDir(int amount, boolean onlyHorizontal, boolean onlyVertical) { @@ -447,36 +452,36 @@ public class SelectionCommands { region = clipboard.getRegion(); BlockVector3 origin = clipboard.getOrigin(); - actor.print("Offset: " + origin); + actor.printInfo(TranslatableComponent.of("worldedit.size.offset", TextComponent.of(origin.toString()))); } else { region = session.getSelection(world); - actor.print("Type: " + session.getRegionSelector(world).getTypeName()); + actor.printInfo(TranslatableComponent.of("worldedit.size.type", TextComponent.of(session.getRegionSelector(world).getTypeName()))); for (String line : session.getRegionSelector(world).getInformationLines()) { - actor.print(line); + actor.printInfo(TextComponent.of(line)); } } BlockVector3 size = region.getMaximumPoint() .subtract(region.getMinimumPoint()) .add(1, 1, 1); - actor.print("Size: " + size); - actor.print("Cuboid distance: " + region.getMaximumPoint().distance(region.getMinimumPoint())); - actor.print("# of blocks: " + region.getArea()); + actor.printInfo(TranslatableComponent.of("worldedit.size.size", TextComponent.of(size.toString()))); + actor.printInfo(TranslatableComponent.of("worldedit.size.distance", TextComponent.of(region.getMaximumPoint().distance(region.getMinimumPoint())))); + actor.printInfo(TranslatableComponent.of("worldedit.size.blocks", TextComponent.of(region.getArea()))); } - @Command( name = "/count", desc = "Counts the number of blocks matching a mask" ) @CommandPermissions("worldedit.analysis.count") - public void count(Actor actor, World world, LocalSession session, EditSession editSession, + public int count(Actor actor, World world, LocalSession session, EditSession editSession, @Arg(desc = "The mask of blocks to match") Mask mask) throws WorldEditException { int count = editSession.countBlocks(session.getSelection(world), mask); - actor.print("Counted: " + count); + actor.printInfo(TranslatableComponent.of("worldedit.count.counted", TextComponent.of(count))); + return count; } @Command( @@ -510,13 +515,13 @@ public class SelectionCommands { } else { distribution = session.getLastDistribution(); if (distribution == null) { - actor.printError("No previous distribution."); + actor.printError(TranslatableComponent.of("worldedit.distr.no-previous")); return; } } if (distribution.isEmpty()) { // *Should* always be false - actor.printError("No blocks counted."); + actor.printError(TranslatableComponent.of("worldedit.distr.no-blocks")); return; } @@ -542,7 +547,7 @@ public class SelectionCommands { if (selector == null) { session.getRegionSelector(world).clear(); session.dispatchCUISelection(actor); - actor.print("Selection cleared."); + actor.printInfo(TranslatableComponent.of("worldedit.select.cleared")); return; } @@ -552,38 +557,38 @@ public class SelectionCommands { switch (selector) { case CUBOID: newSelector = new CuboidRegionSelector(oldSelector); - actor.print("Cuboid: left click for point 1, right click for point 2"); + actor.printInfo(TranslatableComponent.of("worldedit.select.cuboid.message")); break; case EXTEND: newSelector = new ExtendingCuboidRegionSelector(oldSelector); - actor.print("Cuboid: left click for a starting point, right click to extend"); + actor.printInfo(TranslatableComponent.of("worldedit.select.extend.message")); break; case POLY: { newSelector = new Polygonal2DRegionSelector(oldSelector); - actor.print("2D polygon selector: Left/right click to add a point."); + actor.printInfo(TranslatableComponent.of("worldedit.select.poly.message")); Optional limit = ActorSelectorLimits.forActor(actor).getPolygonVertexLimit(); - limit.ifPresent(integer -> actor.print(integer + " points maximum.")); + limit.ifPresent(integer -> actor.printInfo(TranslatableComponent.of("worldedit.select.poly.limit-message", TextComponent.of(integer)))); break; } case ELLIPSOID: newSelector = new EllipsoidRegionSelector(oldSelector); - actor.print("Ellipsoid selector: left click=center, right click to extend"); + actor.printInfo(TranslatableComponent.of("worldedit.select.ellipsoid.message")); break; case SPHERE: newSelector = new SphereRegionSelector(oldSelector); - actor.print("Sphere selector: left click=center, right click to set radius"); + actor.printInfo(TranslatableComponent.of("worldedit.select.sphere.message")); break; case CYL: newSelector = new CylinderRegionSelector(oldSelector); - actor.print("Cylindrical selector: Left click=center, right click to extend."); + actor.printInfo(TranslatableComponent.of("worldedit.select.cyl.message")); break; case CONVEX: case HULL: case POLYHEDRON: { newSelector = new ConvexPolyhedralRegionSelector(oldSelector); - actor.print("Convex polyhedral selector: Left click=First vertex, right click to add more."); + actor.printInfo(TranslatableComponent.of("worldedit.select.convex.message")); Optional limit = ActorSelectorLimits.forActor(actor).getPolyhedronVertexLimit(); - limit.ifPresent(integer -> actor.print(integer + " points maximum.")); + limit.ifPresent(integer -> actor.printInfo(TranslatableComponent.of("worldedit.select.convex.limit-message", TextComponent.of(integer)))); break; } case LIST: @@ -593,13 +598,13 @@ public class SelectionCommands { TextComponentProducer contents = box.getContents(); contents.append(SubtleFormat.wrap("Select one of the modes below:")).newline(); - box.appendCommand("cuboid", "Select two corners of a cuboid", "//sel cuboid"); - box.appendCommand("extend", "Fast cuboid selection mode", "//sel extend"); - box.appendCommand("poly", "Select a 2D polygon with height", "//sel poly"); - box.appendCommand("ellipsoid", "Select an ellipsoid", "//sel ellipsoid"); - box.appendCommand("sphere", "Select a sphere", "//sel sphere"); - box.appendCommand("cyl", "Select a cylinder", "//sel cyl"); - box.appendCommand("convex", "Select a convex polyhedral", "//sel convex"); + box.appendCommand("cuboid", TranslatableComponent.of("worldedit.select.cuboid.description"), "//sel cuboid"); + box.appendCommand("extend", TranslatableComponent.of("worldedit.select.extend.description"), "//sel extend"); + box.appendCommand("poly", TranslatableComponent.of("worldedit.select.poly.description"), "//sel poly"); + box.appendCommand("ellipsoid", TranslatableComponent.of("worldedit.select.ellipsoid.description"), "//sel ellipsoid"); + box.appendCommand("sphere", TranslatableComponent.of("worldedit.select.sphere.description"), "//sel sphere"); + box.appendCommand("cyl", TranslatableComponent.of("worldedit.select.cyl.description"), "//sel cyl"); + box.appendCommand("convex", TranslatableComponent.of("worldedit.select.convex.description"), "//sel convex"); actor.print(box.create(1)); return; @@ -616,7 +621,7 @@ public class SelectionCommands { if (found != null) { session.setDefaultRegionSelector(found); - actor.print("Your default region selector is now " + found.name() + "."); + actor.printInfo(TranslatableComponent.of("worldedit.select.default-set", TextComponent.of(found.name()))); } else { throw new RuntimeException("Something unexpected happened. Please report this."); } @@ -679,7 +684,7 @@ public class SelectionCommands { @Override public Component create(int page) throws InvalidComponentException { - super.getContents().append(TextComponent.of("Total Block Count: " + totalBlocks, TextColor.GRAY)) + super.getContents().append(TranslatableComponent.of("worldedit.distr.total", TextColor.GRAY, TextComponent.of(totalBlocks))) .append(TextComponent.newline()); return super.create(page); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java index cec687204..61878e040 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SuperPickaxeCommands.java @@ -51,7 +51,7 @@ public class SuperPickaxeCommands { public void single(Player player, LocalSession session) throws WorldEditException { session.setSuperPickaxe(new SinglePickaxe()); session.enableSuperPickAxe(); - player.printInfo(TranslatableComponent.of("worldedit.superpickaxe.mode.single")); + player.printInfo(TranslatableComponent.of("worldedit.tool.superpickaxe.mode.single")); } @Command( @@ -72,7 +72,7 @@ public class SuperPickaxeCommands { session.setSuperPickaxe(new AreaPickaxe(range)); session.enableSuperPickAxe(); - player.printInfo(TranslatableComponent.of("worldedit.superpickaxe.mode.area")); + player.printInfo(TranslatableComponent.of("worldedit.tool.superpickaxe.mode.area")); } @Command( @@ -94,6 +94,6 @@ public class SuperPickaxeCommands { session.setSuperPickaxe(new RecursivePickaxe(range)); session.enableSuperPickAxe(); - player.printInfo(TranslatableComponent.of("worldedit.superpickaxe.mode.recursive")); + player.printInfo(TranslatableComponent.of("worldedit.tool.superpickaxe.mode.recursive")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java index dfcb66d1b..3e6be110e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java @@ -235,7 +235,7 @@ public class ToolCommands { LocalConfiguration config = we.getConfiguration(); if (range > config.maxSuperPickaxeSize) { - player.printError("Maximum range: " + config.maxSuperPickaxeSize); + player.printError(TranslatableComponent.of("worldedit.superpickaxe.max-range", TextComponent.of(config.maxSuperPickaxeSize))); return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java index 2597372d5..3a9335c59 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java @@ -28,6 +28,7 @@ import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.util.HandSide; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; import org.enginehub.piston.annotation.param.Arg; @@ -54,15 +55,15 @@ public class ToolUtilCommands { Boolean superPickaxe) { boolean hasSuperPickAxe = session.hasSuperPickAxe(); if (superPickaxe != null && superPickaxe == hasSuperPickAxe) { - player.printError("Super pickaxe already " + (superPickaxe ? "enabled" : "disabled") + "."); + player.printError(TranslatableComponent.of(superPickaxe ? "worldedit.tool.superpickaxe.enabled.already" : "worldedit.tool.superpickaxe.disabled.already")); return; } if (hasSuperPickAxe) { session.disableSuperPickAxe(); - player.print("Super pickaxe disabled."); + player.printInfo(TranslatableComponent.of("worldedit.tool.superpickaxe.disabled")); } else { session.enableSuperPickAxe(); - player.print("Super pickaxe enabled."); + player.printInfo(TranslatableComponent.of("worldedit.tool.superpickaxe.enabled")); } } @@ -77,9 +78,9 @@ public class ToolUtilCommands { Mask mask) throws WorldEditException { session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setMask(mask); if (mask == null) { - player.print("Brush mask disabled."); + player.printInfo(TranslatableComponent.of("worldedit.tool.mask.disabled")); } else { - player.print("Brush mask set."); + player.printInfo(TranslatableComponent.of("worldedit.tool.mask.set")); } } @@ -93,7 +94,7 @@ public class ToolUtilCommands { @Arg(desc = "The pattern of blocks to use") Pattern pattern) throws WorldEditException { session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setFill(pattern); - player.print("Brush material set."); + player.printInfo(TranslatableComponent.of("worldedit.tool.material.set")); } @Command( @@ -105,7 +106,7 @@ public class ToolUtilCommands { @Arg(desc = "The range of the brush") int range) throws WorldEditException { session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setRange(range); - player.print("Brush range set."); + player.printInfo(TranslatableComponent.of("worldedit.tool.range.set")); } @Command( @@ -119,7 +120,7 @@ public class ToolUtilCommands { we.checkMaxBrushRadius(size); session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setSize(size); - player.print("Brush size set."); + player.printInfo(TranslatableComponent.of("worldedit.tool.size.set")); } @Command( @@ -132,9 +133,9 @@ public class ToolUtilCommands { Mask mask) throws WorldEditException { session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType()).setTraceMask(mask); if (mask == null) { - player.print("Trace mask disabled."); + player.printInfo(TranslatableComponent.of("worldedit.tool.tracemask.disabled")); } else { - player.print("Trace mask set."); + player.printInfo(TranslatableComponent.of("worldedit.tool.tracemask.set")); } } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java index bd674f108..ca7f3a394 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java @@ -19,10 +19,13 @@ package com.sk89q.worldedit.command.util; +import static com.sk89q.worldedit.internal.command.CommandUtil.byCleanName; +import static com.sk89q.worldedit.internal.command.CommandUtil.getSubCommands; +import static java.util.stream.Collectors.toList; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.util.formatting.component.CommandListBox; import com.sk89q.worldedit.util.formatting.component.CommandUsageBox; @@ -39,10 +42,6 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.sk89q.worldedit.internal.command.CommandUtil.byCleanName; -import static com.sk89q.worldedit.internal.command.CommandUtil.getSubCommands; -import static java.util.stream.Collectors.toList; - /** * Implementation of the //help command. */ @@ -91,8 +90,8 @@ public class PrintCommandHelp { Map subCommands = getSubCommands(currentCommand); if (subCommands.isEmpty()) { - actor.printError(String.format("'%s' has no sub-commands. (Maybe '%s' is for a parameter?)", - toCommandString(visited), subCommand)); + actor.printError(TranslatableComponent.of("worldedit.help.no-subcommands", + TextComponent.of(toCommandString(visited)), TextComponent.of(subCommand))); // full help for single command CommandUsageBox box = new CommandUsageBox(visited, visited.stream() .map(Command::getName).collect(Collectors.joining(" ")), helpRootCommand); @@ -104,8 +103,8 @@ public class PrintCommandHelp { currentCommand = subCommands.get(subCommand); visited.add(currentCommand); } else { - actor.printError(String.format("The sub-command '%s' under '%s' could not be found.", - subCommand, toCommandString(visited))); + actor.printError(TranslatableComponent.of("worldedit.help.subcommand-not-found", + TextComponent.of(subCommand), TextComponent.of(toCommandString(visited)))); // list subcommands for currentCommand printCommands(page, getSubCommands(Iterables.getLast(visited)).values().stream(), actor, visited, helpRootCommand); return; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java index 775cd2475..6bb5959c9 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java @@ -35,7 +35,6 @@ import com.sk89q.worldedit.util.HandSide; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.TargetBlock; import com.sk89q.worldedit.util.auth.AuthorizationException; -import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java index a08507e03..b679f1d41 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java @@ -21,7 +21,6 @@ package com.sk89q.worldedit.function.operation; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java index e32ec54d9..e2612249a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java @@ -20,7 +20,6 @@ package com.sk89q.worldedit.function.visitor; import static com.google.common.base.Preconditions.checkNotNull; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java index b8e9cb99f..c1e8e7b56 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/EntityVisitor.java @@ -20,7 +20,6 @@ package com.sk89q.worldedit.function.visitor; import static com.google.common.base.Preconditions.checkNotNull; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; @@ -33,9 +32,7 @@ import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; -import java.util.Collection; import java.util.Iterator; -import java.util.List; /** * Visits entities as provided by an {@code Iterator}. diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java index 70d3c9df0..5c1f9f62f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/FlatRegionVisitor.java @@ -20,7 +20,6 @@ package com.sk89q.worldedit.function.visitor; import static com.google.common.base.Preconditions.checkNotNull; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; @@ -34,9 +33,6 @@ import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; -import java.util.Collection; -import java.util.List; - /** * Applies region functions to columns in a {@link FlatRegion}. */ diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java index a7070e1c4..670c3861b 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/RegionVisitor.java @@ -19,8 +19,6 @@ package com.sk89q.worldedit.function.visitor; -import static com.sk89q.worldedit.util.translation.LocalisationHelpers.pluraliseI18n; - import com.google.common.collect.Lists; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.function.RegionFunction; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandListBox.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandListBox.java index 2efc8b7b3..9dda1c49f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandListBox.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandListBox.java @@ -58,6 +58,7 @@ public class CommandListBox extends PaginationBox { appendCommand(alias, description, null); } + @Deprecated public void appendCommand(String alias, String description, String insertion) { appendCommand(alias, TextComponent.of(description), insertion); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java index ab5d1e3d1..a0921b81d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java @@ -33,7 +33,6 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.Type; import java.net.URL; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.text.MessageFormat; import java.util.HashMap; diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index 341c5a2ee..aba676629 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -54,10 +54,10 @@ "worldedit.searchitem.too-short": "Enter a longer search string (len > 2).", "worldedit.searchitem.b-and-i": "You cannot use both the 'b' and 'i' flags simultaneously.", "worldedit.watchdog.no-hook": "This platform has no watchdog hook.", - "worldedit.watchdog.already-active": "Watchdog hook already active.", - "worldedit.watchdog.already-inactive": "Watchdog hook already inactive.", - "worldedit.watchdog.now-active": "Watchdog hook now active.", - "worldedit.watchdog.now-inactive": "Watchdog hook now inactive.", + "worldedit.watchdog.active.already": "Watchdog hook already active.", + "worldedit.watchdog.inactive.already": "Watchdog hook already inactive.", + "worldedit.watchdog.active": "Watchdog hook now active.", + "worldedit.watchdog.inactive": "Watchdog hook now inactive.", "worldedit.world.remove": "Removed world override.", "worldedit.world.set": "Set the world override to {0}. (Use //world to go back to default)", @@ -93,6 +93,47 @@ "worldedit.schematic.delete.deleted": "{0} has been deleted.", "worldedit.schematic.formats.title": "Available clipboard formats (Name: Lookup names)", + "worldedit.pos.already-set": "Position already set.", + "worldedit.pos.console-require-coords": "You must provide coordinates as console.", + "worldedit.hpos.no-block": "No block in sight!", + "worldedit.hpos.already-set": "Position already set.", + "worldedit.chunk.selected-multiple": "Chunks selected: ({0}, {1}) - ({2}, {3})", + "worldedit.chunk.selected": "Chunk selected: {0}, {1}", + "worldedit.wand.invalid": "Wand item is mis-configured or disabled.", + "worldedit.wand.selwand.info": "Left click: select pos #1; Right click: select pos #2", + "worldedit.wand.navwand.info": "Left click: jump to location; Right click: pass through walls", + "worldedit.contract.contracted": "Region contracted {0} blocks.", + "worldedit.shift.shifted": "Region shifted.", + "worldedit.outset.outset": "Region outset.", + "worldedit.inset.inset": "Region inset.", + "worldedit.size.offset": "Offset: {0}", + "worldedit.size.type": "Type: {0}", + "worldedit.size.size": "Size: {0}", + "worldedit.size.distance": "Cuboid distance: {0}", + "worldedit.size.blocks": "# of blocks: {0}", + "worldedit.count.counted": "Counted: {0}", + "worldedit.distr.no-blocks": "No blocks counted.", + "worldedit.distr.no-previous": "No previous distribution.", + "worldedit.distr.total": "Total Block Count: {0}", + "worldedit.select.cleared": "Selection cleared.", + "worldedit.select.cuboid.message": "Cuboid: left click for point 1, right click for point 2", + "worldedit.select.cuboid.description": "Select two corners of a cuboid", + "worldedit.select.extend.message": "Cuboid: left click for a starting point, right click to extend", + "worldedit.select.extend.description": "Fast cuboid selection mode", + "worldedit.select.poly.message": "2D polygon selector: Left/right click to add a point.", + "worldedit.select.poly.limit-message": "{0} points maximum.", + "worldedit.select.poly.description": "Select a 2D polygon with height", + "worldedit.select.ellipsoid.message": "Ellipsoid selector: left click=center, right click to extend", + "worldedit.select.ellipsoid.description": "Select an ellipsoid", + "worldedit.select.sphere.message": "Sphere selector: left click=center, right click to set radius", + "worldedit.select.sphere.description": "Select a sphere", + "worldedit.select.cyl.message": "Cylindrical selector: Left click=center, right click to extend", + "worldedit.select.cyl.description": "Select a cylinder", + "worldedit.select.convex.message": "Convex polyhedral selector: Left click=First vertex, right click to add more.", + "worldedit.select.convex.limit-message": "{0} points maximum.", + "worldedit.select.convex.description": "Select a convex polyhedral", + "worldedit.select.default-set": "Your default region selector is now {0}.", + "worldedit.drain.drained": "{0} blocks have been drained.", "worldedit.fill.created": "{0} blocks have been filled.", "worldedit.fillr.created": "{0} blocks have been filled.", @@ -203,10 +244,21 @@ "worldedit.tool.lrbuild.equip": "Long-range building tool bound to {0}.", "worldedit.tool.lrbuild.set": "Left-click set to {0}; right-click set to {1}.", - "worldedit.superpickaxe.mode.single": "Mode is now single. Left click with a pickaxe. // to disable.", - "worldedit.superpickaxe.mode.area": "Mode is now area. Left click with a pickaxe. // to disable.", - "worldedit.superpickaxe.mode.recursive": "Mode is now recursive. Left click with a pickaxe. // to disable.", - "worldedit.superpickaxe.max-range": "Maximum range is {0}.", + "worldedit.tool.superpickaxe.mode.single": "Mode is now single. Left click with a pickaxe. // to disable.", + "worldedit.tool.superpickaxe.mode.area": "Mode is now area. Left click with a pickaxe. // to disable.", + "worldedit.tool.superpickaxe.mode.recursive": "Mode is now recursive. Left click with a pickaxe. // to disable.", + "worldedit.tool.superpickaxe.max-range": "Maximum range is {0}.", + "worldedit.tool.superpickaxe.enabled.already": "Super pickaxe already enabled.", + "worldedit.tool.superpickaxe.disabled.already": "Super pickaxe already disabled.", + "worldedit.tool.superpickaxe.enabled": "Super pickaxe enabled.", + "worldedit.tool.superpickaxe.disabled": "Super pickaxe disabled.", + "worldedit.tool.mask.set": "Brush mask set.", + "worldedit.tool.mask.disabled": "Brush mask disabled.", + "worldedit.tool.material.set": "Brush material set.", + "worldedit.tool.range.set": "Brush range set.", + "worldedit.tool.size.set": "Brush size set.", + "worldedit.tool.tracemask.set": "Trace mask set.", + "worldedit.tool.tracemask.disabled": "Trace mask disabled.", "worldedit.operation.affected.biome": "{0} biomes affected", "worldedit.operation.affected.block": "{0} blocks affected", @@ -214,5 +266,7 @@ "worldedit.operation.affected.entity": "{0} entities affected", "worldedit.operation.deform.expression": "deformed using {0}", - "worldedit.help.command-not-found": "The command '{0}' could not be found." + "worldedit.help.command-not-found": "The command '{0}' could not be found.", + "worldedit.help.no-subcommands": "'{0}' has no sub-commands. (Maybe '{1}' is for a parameter?)", + "worldedit.help.subcommand-not-found": "The sub-command '{0}' under '{1}' could not be found." } \ No newline at end of file From fc0fee39cbe9e64e3ff7a259b51197144f938f19 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 1 Nov 2019 22:33:31 +1000 Subject: [PATCH 07/16] Added a tonne more translations --- .../com/sk89q/worldedit/cli/CLIWorldEdit.java | 5 ++-- .../java/com/sk89q/worldedit/WorldEdit.java | 20 ++++++------- .../worldedit/command/ChunkCommands.java | 9 +++--- .../worldedit/command/GeneralCommands.java | 2 +- .../worldedit/command/SchematicCommands.java | 4 +-- .../worldedit/command/ScriptingCommands.java | 7 +++-- .../worldedit/command/SnapshotCommands.java | 30 +++++++++++-------- .../util/WorldEditAsyncCommandBuilder.java | 8 ++++- .../platform/AbstractPlayerActor.java | 6 ++-- .../platform/PlatformCommandManager.java | 6 ++-- .../src/main/resources/lang/strings.json | 26 ++++++++++++++++ 11 files changed, 81 insertions(+), 42 deletions(-) diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java index ba77fb1f2..9bff097c1 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java @@ -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.TextComponent; 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(TextComponent.of("Stopping!")); break; } CommandEvent event = new CommandEvent(commandSender, line); WorldEdit.getInstance().getEventBus().post(event); if (!event.isCancelled()) { - commandSender.printError("Unknown command!"); + commandSender.printError(TextComponent.of("Unknown command!")); } else { saveAllWorlds(false); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java b/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java index 7c65784d2..57a38d8ee 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java @@ -49,6 +49,8 @@ import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.concurrency.EvenMoreExecutors; import com.sk89q.worldedit.util.eventbus.EventBus; import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; import com.sk89q.worldedit.util.io.file.FileSelectionAbortedException; import com.sk89q.worldedit.util.io.file.FilenameException; import com.sk89q.worldedit.util.io.file.FilenameResolutionException; @@ -634,7 +636,7 @@ public final class WorldEdit { * @param player the player * @param f the script file to execute * @param args arguments for the script - * @throws WorldEditException + * @throws WorldEditException if something goes wrong */ public void runScript(Player player, File f, String[] args) throws WorldEditException { String filename = f.getPath(); @@ -642,7 +644,7 @@ public final class WorldEdit { String ext = filename.substring(index + 1); if (!ext.equalsIgnoreCase("js")) { - player.printError("Only .js scripts are currently supported"); + player.printError(TranslatableComponent.of("worldedit.script.unsupported")); return; } @@ -655,7 +657,7 @@ public final class WorldEdit { file = WorldEdit.class.getResourceAsStream("craftscripts/" + filename); if (file == null) { - player.printError("Script does not exist: " + filename); + player.printError(TranslatableComponent.of("worldedit.script.file-not-found", TextComponent.of(filename))); return; } } else { @@ -668,7 +670,7 @@ public final class WorldEdit { in.close(); script = new String(data, 0, data.length, StandardCharsets.UTF_8); } catch (IOException e) { - player.printError("Script read error: " + e.getMessage()); + player.printError(TranslatableComponent.of("worldedit.script.read-error", TextComponent.of(e.getMessage()))); return; } @@ -681,8 +683,7 @@ public final class WorldEdit { try { engine = new RhinoCraftScriptEngine(); } catch (NoClassDefFoundError ignored) { - player.printError("Failed to find an installed script engine."); - player.printError("Please see https://worldedit.enginehub.org/en/latest/usage/other/craftscripts/"); + player.printError(TranslatableComponent.of("worldedit.script.no-script-engine")); return; } @@ -696,14 +697,13 @@ public final class WorldEdit { try { engine.evaluate(script, filename, vars); } catch (ScriptException e) { - player.printError("Failed to execute:"); - player.print(TextComponent.of(e.getMessage())); + player.printError(TranslatableComponent.of("worldedit.script.failed", TextComponent.of(e.getMessage(), TextColor.WHITE))); logger.warn("Failed to execute script", e); } catch (NumberFormatException | WorldEditException e) { throw e; } catch (Throwable e) { - player.printError("Failed to execute (see console):"); - player.print(TextComponent.of(e.getClass().getCanonicalName())); + player.printError(TranslatableComponent.of("worldedit.script.failed-console", TextComponent.of(e.getClass().getCanonicalName(), + TextColor.WHITE))); logger.warn("Failed to execute script", e); } finally { for (EditSession editSession : scriptContext.getEditSessions()) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java index 50d513a67..619bfa644 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java @@ -38,6 +38,7 @@ import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.formatting.component.PaginationBox; import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.event.ClickEvent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; import com.sk89q.worldedit.world.World; @@ -85,9 +86,9 @@ public class ChunkCommands { int chunkZ = (int) Math.floor(pos.getBlockZ() / 16.0); final BlockVector2 chunkPos = BlockVector2.at(chunkX, chunkZ); - player.print("Chunk: " + chunkX + ", " + chunkZ); - player.print("Old format: " + LegacyChunkStore.getFilename(chunkPos)); - player.print("McRegion: region/" + McRegionChunkStore.getFilename(chunkPos)); + player.printInfo(TranslatableComponent.of("worldedit.chunkinfo.chunk", TextComponent.of(chunkX), TextComponent.of(chunkZ))); + player.printInfo(TranslatableComponent.of("worldedit.chunkinfo.old-filename", TextComponent.of(LegacyChunkStore.getFilename(chunkPos)))); + player.printInfo(TranslatableComponent.of("worldedit.chunkinfo.mcregion-filename", TextComponent.of(McRegionChunkStore.getFilename(chunkPos)))); } @Command( @@ -101,7 +102,7 @@ public class ChunkCommands { WorldEditAsyncCommandBuilder.createAndSendMessage(actor, () -> new ChunkListPaginationBox(region).create(page), - "Listing chunks for " + actor.getName()); + TranslatableComponent.of("worldedit.listchunks.listfor", TextComponent.of(actor.getName()))); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java index 82bd2c8f4..55cde4d5f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java @@ -289,7 +289,7 @@ public class GeneralCommands { } WorldEditAsyncCommandBuilder.createAndSendMessage(actor, new ItemSearcher(search, blocksOnly, itemsOnly, page), - "(Please wait... searching items.)"); + TranslatableComponent.of("worldedit.searchitem.searching")); } private static class ItemSearcher implements Callable { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java index 07d30991f..99755dfd7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java @@ -129,7 +129,7 @@ public class SchematicCommands { SchematicLoadTask task = new SchematicLoadTask(actor, f, format); AsyncCommandBuilder.wrap(task, actor) .registerWithSupervisor(worldEdit.getSupervisor(), "Loading schematic " + filename) - .sendMessageAfterDelay("(Please wait... loading schematic.)") + .sendMessageAfterDelay(TranslatableComponent.of("worldedit.schematic.load.loading")) .onSuccess(TextComponent.of(filename, TextColor.GOLD) .append(TextComponent.of(" loaded. Paste it with ", TextColor.LIGHT_PURPLE)) .append(CodeFormat.wrap("//paste").clickEvent(ClickEvent.of(ClickEvent.Action.SUGGEST_COMMAND, "//paste"))), @@ -188,7 +188,7 @@ public class SchematicCommands { SchematicSaveTask task = new SchematicSaveTask(actor, f, format, holder, overwrite); AsyncCommandBuilder.wrap(task, actor) .registerWithSupervisor(worldEdit.getSupervisor(), "Saving schematic " + filename) - .sendMessageAfterDelay("(Please wait... saving schematic.)") + .sendMessageAfterDelay(TranslatableComponent.of("worldedit.schematic.save.saving")) .onSuccess(filename + " saved" + (overwrite ? " (overwriting previous file)." : "."), null) .onFailure("Failed to load schematic", worldEdit.getPlatformManager().getPlatformCommandManager().getExceptionConverter()) .buildAndExec(worldEdit.getExecutorService()); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java index e60a3db51..27c27b793 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java @@ -26,6 +26,7 @@ import com.sk89q.worldedit.command.util.CommandPermissions; import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator; import com.sk89q.worldedit.command.util.Logging; import com.sk89q.worldedit.entity.Player; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.CommandContainer; import org.enginehub.piston.annotation.param.Arg; @@ -67,7 +68,7 @@ public class ScriptingCommands { @Arg(desc = "Arguments to the CraftScript", def = "", variable = true) List args) throws WorldEditException { if (!player.hasPermission("worldedit.scripting.execute." + filename)) { - player.printError("You don't have permission to use that script."); + player.printError(TranslatableComponent.of("worldedit.execute.script-permissions")); return; } @@ -93,12 +94,12 @@ public class ScriptingCommands { String lastScript = session.getLastScript(); if (!player.hasPermission("worldedit.scripting.execute." + lastScript)) { - player.printError("You don't have permission to use that script."); + player.printError(TranslatableComponent.of("worldedit.execute.script-permissions")); return; } if (lastScript == null) { - player.printError("Use /cs with a script name first."); + player.printError(TranslatableComponent.of("worldedit.executelast.no-script")); return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java index 5adc7cd54..b15c4f336 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java @@ -86,7 +86,7 @@ public class SnapshotCommands { if (!snapshots.isEmpty()) { actor.print(new SnapshotListBox(world.getName(), snapshots).create(page)); } else { - actor.printError("No snapshots are available. See console for details."); + actor.printError(TranslatableComponent.of("worldedit.restore.none-found-console")); // Okay, let's toss some debugging information! File dir = config.snapshotRepo.getDirectory(); @@ -138,9 +138,9 @@ public class SnapshotCommands { } else { try { session.setSnapshot(config.snapshotRepo.getSnapshot(name)); - actor.print("Snapshot set to: " + name); + actor.printInfo(TranslatableComponent.of("worldedit.snapshot.use", TextComponent.of(name))); } catch (InvalidSnapshotException e) { - actor.printError("That snapshot does not exist or is not available."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-available")); } } } @@ -161,23 +161,23 @@ public class SnapshotCommands { } if (index < 1) { - actor.printError("Invalid index, must be equal or higher then 1."); + actor.printError(TranslatableComponent.of("worldedit.snapshot.index-above-0")); return; } try { List snapshots = config.snapshotRepo.getSnapshots(true, world.getName()); if (snapshots.size() < index) { - actor.printError("Invalid index, must be between 1 and " + snapshots.size() + "."); + actor.printError(TranslatableComponent.of("worldedit.snapshot.index-oob", TextComponent.of(snapshots.size()))); return; } Snapshot snapshot = snapshots.get(index - 1); if (snapshot == null) { - actor.printError("That snapshot does not exist or is not available."); + actor.printError(TranslatableComponent.of("worldedit.restore.not-available")); return; } session.setSnapshot(snapshot); - actor.print("Snapshot set to: " + snapshot.getName()); + actor.printInfo(TranslatableComponent.of("worldedit.snapshot.use", TextComponent.of(snapshot.getName()))); } catch (MissingWorldException e) { actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); } @@ -203,11 +203,13 @@ public class SnapshotCommands { Snapshot snapshot = config.snapshotRepo.getSnapshotBefore(date, world.getName()); if (snapshot == null) { - actor.printError("Couldn't find a snapshot before " - + dateFormat.withZone(session.getTimeZone()).format(date) + "."); + actor.printError(TranslatableComponent.of( + "worldedit.snapshot.none-before", + TextComponent.of(dateFormat.withZone(session.getTimeZone()).format(date))) + ); } else { session.setSnapshot(snapshot); - actor.print("Snapshot set to: " + snapshot.getName()); + actor.printInfo(TranslatableComponent.of("worldedit.snapshot.use", TextComponent.of(snapshot.getName()))); } } catch (MissingWorldException ex) { actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); @@ -233,11 +235,13 @@ public class SnapshotCommands { try { Snapshot snapshot = config.snapshotRepo.getSnapshotAfter(date, world.getName()); if (snapshot == null) { - actor.printError("Couldn't find a snapshot after " - + dateFormat.withZone(session.getTimeZone()).format(date) + "."); + actor.printError(TranslatableComponent.of( + "worldedit.snapshot.none-after", + TextComponent.of(dateFormat.withZone(session.getTimeZone()).format(date))) + ); } else { session.setSnapshot(snapshot); - actor.print("Snapshot set to: " + snapshot.getName()); + actor.printInfo(TranslatableComponent.of("worldedit.snapshot.use", TextComponent.of(snapshot.getName()))); } } catch (MissingWorldException ex) { actor.printError(TranslatableComponent.of("worldedit.restore.none-for-world")); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/WorldEditAsyncCommandBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/WorldEditAsyncCommandBuilder.java index f21fb2b6d..901c461fc 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/WorldEditAsyncCommandBuilder.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/WorldEditAsyncCommandBuilder.java @@ -22,6 +22,7 @@ package com.sk89q.worldedit.command.util; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; import javax.annotation.Nullable; import java.util.concurrent.Callable; @@ -33,13 +34,18 @@ public final class WorldEditAsyncCommandBuilder { private WorldEditAsyncCommandBuilder() { } + @Deprecated public static void createAndSendMessage(Actor actor, Callable task, @Nullable String desc) { + createAndSendMessage(actor, task, desc != null ? TextComponent.of(desc) : null); + } + + public static void createAndSendMessage(Actor actor, Callable task, @Nullable Component desc) { final AsyncCommandBuilder builder = AsyncCommandBuilder.wrap(task, actor); if (desc != null) { builder.sendMessageAfterDelay(desc); } builder - .onSuccess((String) null, actor::print) + .onSuccess((String) null, actor::printInfo) .onFailure((String) null, WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().getExceptionConverter()) .buildAndExec(WorldEdit.getInstance().getExecutorService()); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java index 6bb5959c9..edc0c984a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java @@ -35,6 +35,7 @@ import com.sk89q.worldedit.util.HandSide; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.TargetBlock; import com.sk89q.worldedit.util.auth.AuthorizationException; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; @@ -490,13 +491,13 @@ public abstract class AbstractPlayerActor implements Actor, Player, Cloneable { @Override public File openFileOpenDialog(String[] extensions) { - printError("File dialogs are not supported in your environment."); + printError(TranslatableComponent.of("worldedit.platform.no-file-dialog")); return null; } @Override public File openFileSaveDialog(String[] extensions) { - printError("File dialogs are not supported in your environment."); + printError(TranslatableComponent.of("worldedit.platform.no-file-dialog")); return null; } @@ -545,7 +546,6 @@ public abstract class AbstractPlayerActor implements Actor, Player, Cloneable { } - @SuppressWarnings("CloneDoesntCallSuperClone") @Override public Object clone() throws CloneNotSupportedException { throw new CloneNotSupportedException("Not supported"); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java index ec07821f2..dc39e4ee9 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java @@ -497,7 +497,7 @@ public final class PlatformCommandManager { } } catch (ConditionFailedException e) { if (e.getCondition() instanceof PermissionCondition) { - actor.printError("You are not permitted to do that. Are you in the right mode?"); + actor.printError(TranslatableComponent.of("worldedit.command.permissions")); } else { actor.print(e.getRichMessage()); } @@ -559,7 +559,7 @@ public final class PlatformCommandManager { store.injectValue(Key.of(Player.class), ValueProvider.constant((Player) actor)); } else { store.injectValue(Key.of(Player.class), context -> { - throw new CommandException(TextComponent.of("This command must be used with a player."), ImmutableList.of()); + throw new CommandException(TranslatableComponent.of("worldedit.command.player-only"), ImmutableList.of()); }); } store.injectValue(Key.of(Arguments.class), ValueProvider.constant(arguments)); @@ -576,7 +576,7 @@ public final class PlatformCommandManager { } private void handleUnknownException(Actor actor, Throwable t) { - actor.printError("Please report this error: [See console]"); + actor.printError(TranslatableComponent.of("worldedit.command.error.report")); actor.print(TextComponent.of(t.getClass().getName() + ": " + t.getMessage())); log.error("An unexpected error while handling a WorldEdit command", t); } diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index aba676629..713188fed 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -53,6 +53,7 @@ "worldedit.toggleplace.player": "Now placing at the block you stand in.", "worldedit.searchitem.too-short": "Enter a longer search string (len > 2).", "worldedit.searchitem.b-and-i": "You cannot use both the 'b' and 'i' flags simultaneously.", + "worldedit.searchitem.searching": "(Please wait... searching items.)", "worldedit.watchdog.no-hook": "This platform has no watchdog hook.", "worldedit.watchdog.active.already": "Watchdog hook already active.", "worldedit.watchdog.inactive.already": "Watchdog hook already inactive.", @@ -83,11 +84,18 @@ "worldedit.restore.block-place-error": "Last error: {0}", "worldedit.snapshot.use.newest": "Now using newest snapshot.", + "worldedit.snapshot.use": "Snapshot set to: {0}", + "worldedit.snapshot.none-before": "Couldn't find a snapshot before {0}.", + "worldedit.snapshot.none-after": "Couldn't find a snapshot after {0}.", + "worldedit.snapshot.index-above-0": "Invalid index, must be equal or higher then 1.", + "worldedit.snapshot.index-oob": "Invalid index, must be between 1 and {0}.", "worldedit.schematic.unknown-format": "Unknown schematic format: {0}.", "worldedit.schematic.load.does-not-exist": "Schematic {0} does not exist!", + "worldedit.schematic.load.loading": "(Please wait... loading schematic.)", "worldedit.schematic.save.already-exists": "That schematic already exists. Use the -f flag to overwrite it.", "worldedit.schematic.save.failed-directory": "Could not create folder for schematics!", + "worldedit.schematic.save.saving": "(Please wait... saving schematic.)", "worldedit.schematic.delete.does-not-exist": "Schematic {0} does not exist!", "worldedit.schematic.delete.failed": "Deletion of {0} failed! Is it read-only?", "worldedit.schematic.delete.deleted": "{0} has been deleted.", @@ -134,6 +142,11 @@ "worldedit.select.convex.description": "Select a convex polyhedral", "worldedit.select.default-set": "Your default region selector is now {0}.", + "worldedit.chunkinfo.chunk": "Chunk: {0}, {1}", + "worldedit.chunkinfo.old-filename": "Old format: {0}", + "worldedit.chunkinfo.mcregion-filename": "McRegion: region/{0}", + "worldedit.listchunks.listfor": "Listing chunks for: {0}", + "worldedit.drain.drained": "{0} blocks have been drained.", "worldedit.fill.created": "{0} blocks have been filled.", "worldedit.fillr.created": "{0} blocks have been filled.", @@ -215,8 +228,12 @@ "worldedit.version.version": "WorldEdit version {0}", "worldedit.command.time-elapsed": "{0}s elapsed (history: {1} changed; {2} blocks/sec).", + "worldedit.command.permissions": "You are not permitted to do that. Are you in the right mode?", + "worldedit.command.player-only": "This command must be used with a player.", + "worldedit.command.error.report": "Please report this error: [See console]", "worldedit.pastebin.uploading": "(Please wait... sending output to pastebin...)", "worldedit.session.cant-find-session": "Unable to find session for {0}", + "worldedit.platform.no-file-dialog": "File dialogs are not supported in your environment.", "worldedit.tool.max-block-changes": "Max blocks change limit reached.", "worldedit.tool.no-block": "No block in sight!", @@ -260,6 +277,15 @@ "worldedit.tool.tracemask.set": "Trace mask set.", "worldedit.tool.tracemask.disabled": "Trace mask disabled.", + "worldedit.execute.script-permissions": "You don't have permission to use that script.", + "worldedit.executelast.no-script": "Use /cs with a script name first.", + "worldedit.script.read-error": "Script read error: {0}", + "worldedit.script.unsupported": "Only .js scripts are currently supported", + "worldedit.script.file-not-found": "Script does not exist: {0}", + "worldedit.script.no-script-engine": "Failed to find an installed script engine.\nPlease see https://worldedit.enginehub.org/en/latest/usage/other/craftscripts/", + "worldedit.script.failed": "Failed to execute: {0}", + "worldedit.script.failed-console": "Failed to execute (see console): {0}", + "worldedit.operation.affected.biome": "{0} biomes affected", "worldedit.operation.affected.block": "{0} blocks affected", "worldedit.operation.affected.column": "{0} columns affected", From 87fb9f6d0eec7a26f60eec3cc300357d077517af Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sat, 9 Nov 2019 18:35:45 +1000 Subject: [PATCH 08/16] Added the remaining translation nodes --- .../worldedit/command/SelectionCommands.java | 6 ++-- .../worldedit/regions/RegionSelector.java | 14 ++++++++ .../ConvexPolyhedralRegionSelector.java | 16 +++++---- .../selector/CuboidRegionSelector.java | 31 +++++++++++------ .../selector/CylinderRegionSelector.java | 22 +++++++++---- .../selector/EllipsoidRegionSelector.java | 33 ++++++++++++++----- .../ExtendingCuboidRegionSelector.java | 14 ++++++-- .../selector/Polygonal2DRegionSelector.java | 15 ++++++--- .../selector/SphereRegionSelector.java | 10 ++++-- .../src/main/resources/lang/strings.json | 29 ++++++++++++++++ 10 files changed, 147 insertions(+), 43 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java index 6b3bdc515..a104c013c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java @@ -458,8 +458,8 @@ public class SelectionCommands { actor.printInfo(TranslatableComponent.of("worldedit.size.type", TextComponent.of(session.getRegionSelector(world).getTypeName()))); - for (String line : session.getRegionSelector(world).getInformationLines()) { - actor.printInfo(TextComponent.of(line)); + for (Component line : session.getRegionSelector(world).getSelectionInfoLines()) { + actor.print(line); } } BlockVector3 size = region.getMaximumPoint() @@ -531,7 +531,7 @@ public class SelectionCommands { BlockDistributionResult res = new BlockDistributionResult(distribution, separateStates); if (!actor.isPlayer()) res.formatForConsole(); return res.create(finalPage); - }, null); + }, (Component) null); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java index fea83d30a..2a5bbad69 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java @@ -24,9 +24,12 @@ import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.selector.limit.SelectorLimits; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.world.World; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -154,6 +157,17 @@ public interface RegionSelector { * * @return a list of lines describing the region */ + @Deprecated List getInformationLines(); + /** + * Get lines of information about the selection. + * + * @return a list of lines describing the region. + */ + default List getSelectionInfoLines() { + return getInformationLines().stream() + .map(TextComponent::of) + .collect(Collectors.toList()); + } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java index 1c16ec77a..4069f7f45 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java @@ -34,6 +34,9 @@ import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.polyhedron.Triangle; import com.sk89q.worldedit.regions.selector.limit.SelectorLimits; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import java.util.ArrayList; @@ -182,16 +185,15 @@ public class ConvexPolyhedralRegionSelector implements RegionSelector, CUIRegion } @Override - public List getInformationLines() { - List ret = new ArrayList<>(); + public List getSelectionInfoLines() { + List ret = new ArrayList<>(); - ret.add("Vertices: "+region.getVertices().size()); - ret.add("Triangles: "+region.getTriangles().size()); + ret.add(TranslatableComponent.of("worldedit.selection.convex.info.vertices", TextComponent.of(region.getVertices().size()))); + ret.add(TranslatableComponent.of("worldedit.selection.convex.info.triangles", TextComponent.of(region.getTriangles().size()))); return ret; } - @Override public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) { checkNotNull(player); @@ -200,7 +202,7 @@ public class ConvexPolyhedralRegionSelector implements RegionSelector, CUIRegion session.describeCUI(player); - player.print("Started new selection with vertex "+pos+"."); + player.printInfo(TranslatableComponent.of("worldedit.selection.convex.explain.primary", TextComponent.of(pos.toString()))); } @Override @@ -211,7 +213,7 @@ public class ConvexPolyhedralRegionSelector implements RegionSelector, CUIRegion session.describeCUI(player); - player.print("Added vertex " + pos + " to the selection."); + player.printInfo(TranslatableComponent.of("worldedit.selection.convex.explain.secondary", TextComponent.of(pos.toString()))); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java index 913d4a333..235d008e2 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java @@ -32,6 +32,9 @@ import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.selector.limit.SelectorLimits; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import java.util.ArrayList; @@ -154,9 +157,13 @@ public class CuboidRegionSelector implements RegionSelector, CUIRegion { checkNotNull(pos); if (position1 != null && position2 != null) { - player.print("First position set to " + position1 + " (" + region.getArea() + ")."); - } else { - player.print("First position set to " + position1 + "."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.cuboid.explain.primary-area", + TextComponent.of(position1.toString()), + TextComponent.of(region.getArea()) + )); + } else if (position1 != null) { + player.printInfo(TranslatableComponent.of("worldedit.selection.cuboid.explain.primary", TextComponent.of(position1.toString()))); } session.dispatchCUIEvent(player, new SelectionPointEvent(0, pos, getArea())); @@ -169,9 +176,13 @@ public class CuboidRegionSelector implements RegionSelector, CUIRegion { checkNotNull(pos); if (position1 != null && position2 != null) { - player.print("Second position set to " + position2 + " (" + region.getArea() + ")."); - } else { - player.print("Second position set to " + position2 + "."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.cuboid.explain.secondary-area", + TextComponent.of(position2.toString()), + TextComponent.of(region.getArea()) + )); + } else if (position2 != null) { + player.printInfo(TranslatableComponent.of("worldedit.selection.cuboid.explain.secondary", TextComponent.of(position2.toString()))); } session.dispatchCUIEvent(player, new SelectionPointEvent(1, pos, getArea())); @@ -241,15 +252,15 @@ public class CuboidRegionSelector implements RegionSelector, CUIRegion { } @Override - public List getInformationLines() { - final List lines = new ArrayList<>(); + public List getSelectionInfoLines() { + final List lines = new ArrayList<>(); if (position1 != null) { - lines.add("Position 1: " + position1); + lines.add(TranslatableComponent.of("worldedit.selection.cuboid.info.pos1", TextComponent.of(position1.toString()))); } if (position2 != null) { - lines.add("Position 2: " + position2); + lines.add(TranslatableComponent.of("worldedit.selection.cuboid.info.pos2", TextComponent.of(position2.toString()))); } return lines; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java index ae442482c..187edfd2e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java @@ -36,6 +36,9 @@ import com.sk89q.worldedit.regions.CylinderRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.selector.limit.SelectorLimits; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import java.text.NumberFormat; @@ -166,7 +169,7 @@ public class CylinderRegionSelector implements RegionSelector, CUIRegion { @Override public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) { - player.print("Starting a new cylindrical selection at " + pos + "."); + player.printInfo(TranslatableComponent.of("worldedit.selection.cylinder.explain.primary", TextComponent.of(pos.toString()))); session.describeCUI(player); } @@ -176,9 +179,14 @@ public class CylinderRegionSelector implements RegionSelector, CUIRegion { Vector3 center = region.getCenter(); if (!center.equals(Vector3.ZERO)) { - player.print("Radius set to " + NUMBER_FORMAT.format(region.getRadius().getX()) + "/" + NUMBER_FORMAT.format(region.getRadius().getZ()) + " blocks. (" + region.getArea() + ")."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.cylinder.explain.secondary", + TextComponent.of(NUMBER_FORMAT.format(region.getRadius().getX())), + TextComponent.of(NUMBER_FORMAT.format(region.getRadius().getZ())), + TextComponent.of(region.getArea()) + )); } else { - player.printError("You must select the center point before setting the radius."); + player.printError(TranslatableComponent.of("worldedit.selection.cylinder.explain.secondary-missing")); return; } @@ -233,14 +241,14 @@ public class CylinderRegionSelector implements RegionSelector, CUIRegion { } @Override - public List getInformationLines() { - final List lines = new ArrayList<>(); + public List getSelectionInfoLines() { + final List lines = new ArrayList<>(); if (!region.getCenter().equals(Vector3.ZERO)) { - lines.add("Center: " + region.getCenter()); + lines.add(TranslatableComponent.of("worldedit.selection.cylinder.info.center", TextComponent.of(region.getCenter().toString()))); } if (!region.getRadius().equals(Vector2.ZERO)) { - lines.add("Radius: " + region.getRadius()); + lines.add(TranslatableComponent.of("worldedit.selection.cylinder.info.radius", TextComponent.of(region.getRadius().toString()))); } return lines; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java index d31b35afb..86c9d595a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java @@ -33,6 +33,9 @@ import com.sk89q.worldedit.regions.EllipsoidRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.selector.limit.SelectorLimits; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import java.util.ArrayList; @@ -145,9 +148,16 @@ public class EllipsoidRegionSelector implements RegionSelector, CUIRegion { @Override public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) { if (isDefined()) { - player.print("Center position set to " + region.getCenter() + " (" + region.getArea() + ")."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.ellipsoid.explain.primary-area", + TextComponent.of(region.getCenter().toString()), + TextComponent.of(region.getArea()) + )); } else { - player.print("Center position set to " + region.getCenter() + "."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.ellipsoid.explain.primary", + TextComponent.of(region.getCenter().toString()) + )); } session.describeCUI(player); @@ -156,9 +166,16 @@ public class EllipsoidRegionSelector implements RegionSelector, CUIRegion { @Override public void explainSecondarySelection(Actor player, LocalSession session, BlockVector3 pos) { if (isDefined()) { - player.print("Radius set to " + region.getRadius() + " (" + region.getArea() + ")."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.ellipsoid.explain.secondary-area", + TextComponent.of(region.getRadius().toString()), + TextComponent.of(region.getArea()) + )); } else { - player.print("Radius set to " + region.getRadius() + "."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.ellipsoid.explain.secondary", + TextComponent.of(region.getRadius().toString()) + )); } session.describeCUI(player); @@ -204,17 +221,17 @@ public class EllipsoidRegionSelector implements RegionSelector, CUIRegion { } @Override - public List getInformationLines() { - final List lines = new ArrayList<>(); + public List getSelectionInfoLines() { + final List lines = new ArrayList<>(); final Vector3 center = region.getCenter(); if (center.lengthSq() > 0) { - lines.add("Center: " + center); + lines.add(TranslatableComponent.of("worldedit.selection.ellipsoid.info.center", TextComponent.of(center.toString()))); } final Vector3 radius = region.getRadius(); if (radius.lengthSq() > 0) { - lines.add("X/Y/Z radius: " + radius); + lines.add(TranslatableComponent.of("worldedit.selection.ellipsoid.info.radius", TextComponent.of(radius.toString()))); } return lines; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ExtendingCuboidRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ExtendingCuboidRegionSelector.java index 16a285c89..29fda872d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ExtendingCuboidRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ExtendingCuboidRegionSelector.java @@ -24,6 +24,8 @@ import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.selector.limit.SelectorLimits; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import javax.annotation.Nullable; @@ -129,14 +131,22 @@ public class ExtendingCuboidRegionSelector extends CuboidRegionSelector { @Override public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) { - player.print("Started selection at " + pos + " (" + region.getArea() + ")."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.extend.explain.primary", + TextComponent.of(pos.toString()), + TextComponent.of(region.getArea()) + )); explainRegionAdjust(player, session); } @Override public void explainSecondarySelection(Actor player, LocalSession session, BlockVector3 pos) { - player.print("Extended selection to encompass " + pos + " (" + region.getArea() + ")."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.extend.explain.secondary", + TextComponent.of(pos.toString()), + TextComponent.of(region.getArea()) + )); explainRegionAdjust(player, session); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java index 4a0fd7595..4b11f5b56 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java @@ -34,6 +34,9 @@ import com.sk89q.worldedit.regions.Polygonal2DRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.selector.limit.SelectorLimits; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import java.util.Collections; @@ -163,7 +166,7 @@ public class Polygonal2DRegionSelector implements RegionSelector, CUIRegion { @Override public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) { - player.print("Starting a new polygon at " + pos + "."); + player.printInfo(TranslatableComponent.of("worldedit.selection.polygon2d.explain.primary", TextComponent.of(pos.toString()))); session.dispatchCUIEvent(player, new SelectionShapeEvent(getTypeID())); session.dispatchCUIEvent(player, new SelectionPoint2DEvent(0, pos, getArea())); @@ -172,7 +175,11 @@ public class Polygonal2DRegionSelector implements RegionSelector, CUIRegion { @Override public void explainSecondarySelection(Actor player, LocalSession session, BlockVector3 pos) { - player.print("Added point #" + region.size() + " at " + pos + "."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.polygon2d.explain.secondary", + TextComponent.of(region.size()), + TextComponent.of(pos.toString()) + )); session.dispatchCUIEvent(player, new SelectionPoint2DEvent(region.size() - 1, pos, getArea())); session.dispatchCUIEvent(player, new SelectionMinMaxEvent(region.getMinimumY(), region.getMaximumY())); @@ -230,8 +237,8 @@ public class Polygonal2DRegionSelector implements RegionSelector, CUIRegion { } @Override - public List getInformationLines() { - return Collections.singletonList("# points: " + region.size()); + public List getSelectionInfoLines() { + return Collections.singletonList(TranslatableComponent.of("worldedit.selection.polygon2d.info", TextComponent.of(region.size()))); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/SphereRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/SphereRegionSelector.java index 8f5a96269..ae909a077 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/SphereRegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/SphereRegionSelector.java @@ -25,6 +25,8 @@ import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.selector.limit.SelectorLimits; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import javax.annotation.Nullable; @@ -88,9 +90,13 @@ public class SphereRegionSelector extends EllipsoidRegionSelector { @Override public void explainSecondarySelection(Actor player, LocalSession session, BlockVector3 pos) { if (isDefined()) { - player.print("Radius set to " + region.getRadius().getX() + " (" + region.getArea() + ")."); + player.printInfo(TranslatableComponent.of( + "worldedit.selection.sphere.explain.secondary-defined", + TextComponent.of(region.getRadius().getX()), + TextComponent.of(region.getArea()) + )); } else { - player.print("Radius set to " + region.getRadius().getX() + "."); + player.printInfo(TranslatableComponent.of("worldedit.selection.sphere.explain.secondary", TextComponent.of(region.getRadius().getX()))); } session.describeCUI(player); diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index 713188fed..548638d57 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -292,6 +292,35 @@ "worldedit.operation.affected.entity": "{0} entities affected", "worldedit.operation.deform.expression": "deformed using {0}", + "worldedit.selection.convex.info.vertices": "Vertices: {0}", + "worldedit.selection.convex.info.triangles": "Triangles: {0}", + "worldedit.selection.convex.explain.primary": "Started new selection with vertex {0}.", + "worldedit.selection.convex.explain.secondary": "Added vertex {0} to the selection.", + "worldedit.selection.cuboid.info.pos1": "Position 1: {0}", + "worldedit.selection.cuboid.info.pos2": "Position 2: {0}", + "worldedit.selection.cuboid.explain.primary": "First position set to {0}.", + "worldedit.selection.cuboid.explain.primary-area": "First position set to {0} ({1}).", + "worldedit.selection.cuboid.explain.secondary": "Second position set to {0}.", + "worldedit.selection.cuboid.explain.secondary-area": "Second position set to {0} ({1}).", + "worldedit.selection.extend.explain.primary": "Started selection at {0} ({1}).", + "worldedit.selection.extend.explain.secondary": "Extended selection to encompass {0} ({1}).", + "worldedit.selection.ellipsoid.info.center": "Center: {0}", + "worldedit.selection.ellipsoid.info.radius": "X/Y/Z Radius: {0}", + "worldedit.selection.ellipsoid.explain.primary": "Center position set to {0}.", + "worldedit.selection.ellipsoid.explain.primary-area": "Center position set to {0} ({1}).", + "worldedit.selection.ellipsoid.explain.secondary": "Radius set to {0}.", + "worldedit.selection.ellipsoid.explain.secondary-area": "Radius set to {0} ({1}).", + "worldedit.selection.cylinder.info.center": "Center: {0}", + "worldedit.selection.cylinder.info.radius": "Radius: {0}", + "worldedit.selection.cylinder.explain.primary": "Starting a new cylindrical selection at {0}.", + "worldedit.selection.cylinder.explain.secondary": "Radius set to {0}/{1} blocks. ({2})", + "worldedit.selection.cylinder.explain.secondary-missing": "You must select the center point before setting the radius.", + "worldedit.selection.polygon2d.info": "# points: {0}", + "worldedit.selection.polygon2d.explain.primary": "Starting a new polygon at {0}.", + "worldedit.selection.polygon2d.explain.secondary": "Added point #{0} at {1}.", + "worldedit.selection.sphere.explain.secondary": "Radius set to {0}.", + "worldedit.selection.sphere.explain.secondary-defined": "Radius set to {0} ({1}).", + "worldedit.help.command-not-found": "The command '{0}' could not be found.", "worldedit.help.no-subcommands": "'{0}' has no sub-commands. (Maybe '{1}' is for a parameter?)", "worldedit.help.subcommand-not-found": "The sub-command '{0}' under '{1}' could not be found." From 9a01bf9ab2f9f00c7e86a01c6d78fcb566f3821b Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sat, 16 Nov 2019 22:37:14 +1000 Subject: [PATCH 09/16] When custom files are found, use the base files for default values. --- .../worldedit/command/BiomeCommands.java | 2 +- .../worldedit/command/UtilityCommands.java | 3 ++- .../worldedit/regions/RegionSelector.java | 5 ++++- .../util/translation/TranslationManager.java | 22 ++++++++++++------- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java index a04cbeeb4..5666ba7cf 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java @@ -106,7 +106,7 @@ public class BiomeCommands { }) .collect(Collectors.toList())); return paginationBox.create(page); - }, null); + }, (Component) null); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java index d3eb84ea2..21c24cdfe 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java @@ -51,6 +51,7 @@ import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CylinderRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.util.formatting.component.SubtleFormat; +import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; @@ -491,7 +492,7 @@ public class UtilityCommands { new double[]{}, WorldEdit.getInstance().getSessionManager().get(actor).getTimeout()); String formatted = Double.isNaN(result) ? "NaN" : formatForLocale(actor.getLocale()).format(result); return SubtleFormat.wrap(input + " = ").append(TextComponent.of(formatted, TextColor.LIGHT_PURPLE)); - }, null); + }, (Component) null); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java index 2a5bbad69..a12b077da 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java @@ -19,6 +19,7 @@ package com.sk89q.worldedit.regions; +import com.google.common.collect.Lists; import com.sk89q.worldedit.IncompleteRegionException; import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.extension.platform.Actor; @@ -158,7 +159,9 @@ public interface RegionSelector { * @return a list of lines describing the region */ @Deprecated - List getInformationLines(); + default List getInformationLines() { + return Lists.newArrayList(); + }; /** * Get lines of information about the selection. diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java index a0921b81d..b98cb263e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java @@ -85,20 +85,26 @@ public class TranslationManager { } private Optional> loadTranslationFile(String filename) { + Map baseTranslations; + + try { + baseTranslations = parseTranslationFile(ResourceLoader.getResourceRoot("lang/" + filename)); + } catch (IOException e) { + // Seem to be missing base. If the user has provided a file use that. + baseTranslations = new HashMap<>(); + } + File localFile = worldEdit.getWorkingDirectoryFile("lang/" + filename); if (localFile.exists()) { try { - return Optional.of(parseTranslationFile(localFile)); + baseTranslations.putAll(parseTranslationFile(localFile)); } catch (IOException e) { - return Optional.empty(); - } - } else { - try { - return Optional.of(parseTranslationFile(ResourceLoader.getResourceRoot("lang/" + filename))); - } catch (IOException e) { - return Optional.empty(); + // Failed to parse custom language file. Worth printing. + e.printStackTrace(); } } + + return baseTranslations.size() == 0 ? Optional.empty() : Optional.of(baseTranslations); } private boolean tryLoadTranslations(Locale locale) { From f3c97887bc1787c75c8ae28d9f0612fb1bd01dc5 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 17 Nov 2019 14:21:36 +1000 Subject: [PATCH 10/16] Only download translations if a key is provided --- worldedit-core/build.gradle.kts | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index 877199c84..7eb0f967e 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -90,25 +90,25 @@ sourceSets { val crowdinApiKey = "crowdin_apikey" -if (!project.hasProperty(crowdinApiKey)) ext[crowdinApiKey] = "" +if (project.hasProperty(crowdinApiKey)) { + tasks.named("crowdinUpload") { + apiKey = "${project.property(crowdinApiKey)}" + projectId = "worldedit-core" + files = arrayOf( + object { + var name = "strings.json" + var source = "$projectDir/src/main/resources/lang/strings.json" + } + ) + } -tasks.named("crowdinUpload") { - apiKey = "${project.property(crowdinApiKey)}" - projectId = "worldedit-core" - files = arrayOf( - object { - var name = "strings.json" - var source = "$projectDir/src/main/resources/lang/strings.json" - } - ) -} + tasks.named("crowdinDownload") { + apiKey = "${project.property(crowdinApiKey)}" + destination = "$projectDir/src/main/resources/lang" + projectId = "worldedit-core" + } -tasks.named("crowdinDownload") { - apiKey = "${project.property(crowdinApiKey)}" - destination = "$projectDir/src/main/resources/lang" - projectId = "worldedit-core" -} - -tasks.named("processResources").configure { - dependsOn("crowdinDownload") + tasks.named("processResources").configure { + dependsOn("crowdinDownload") + } } From 5d0335eea53437809a9866cfd381c87200c5f210 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 17 Nov 2019 15:31:46 +1000 Subject: [PATCH 11/16] Fixed typo in brush radius too large --- .../main/java/com/sk89q/worldedit/command/BrushCommands.java | 2 +- worldedit-core/src/main/resources/lang/strings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java index c151a5f1d..3fa686190 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java @@ -290,7 +290,7 @@ public class BrushCommands { maxRadius = Math.max(config.maxBrushRadius, config.butcherMaxRadius); } if (radius > maxRadius) { - player.printError(TranslatableComponent.of("worldedit.bruch.radius-too-large", TextComponent.of(maxRadius))); + player.printError(TranslatableComponent.of("worldedit.brush.radius-too-large", TextComponent.of(maxRadius))); return; } diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index 548638d57..f8a005983 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -7,7 +7,7 @@ "worldedit.biomeinfo.position": "Biomes at your position: {0}", "worldedit.biomeinfo.selection": "Biomes in your selection: {0}", - "worldedit.bruch.radius-too-large": "Maximum allowed brush radius: {0}", + "worldedit.brush.radius-too-large": "Maximum allowed brush radius: {0}", "worldedit.brush.apply.description": "Apply brush, apply a function to every block", "worldedit.brush.apply.radius": "The size of the brush", "worldedit.brush.apply.shape": "The shape of the region", From 625be46b3054b67a267aa60e7a77843a186e4ca4 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 17 Nov 2019 16:04:13 +1000 Subject: [PATCH 12/16] Allow translation files to be missing entries, and use the english version in place. --- .../util/translation/TranslationManager.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java index b98cb263e..1a2dbf9b8 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java @@ -76,12 +76,17 @@ public class TranslationManager { this.defaultLocale = defaultLocale; } + private Map filterTranslations(Map translations) { + translations.entrySet().removeIf(entry -> entry.getValue().isEmpty()); + return translations; + } + private Map parseTranslationFile(File file) throws IOException { - return gson.fromJson(Files.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE); + return filterTranslations(gson.fromJson(Files.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE)); } private Map parseTranslationFile(URL file) throws IOException { - return gson.fromJson(Resources.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE); + return filterTranslations(gson.fromJson(Resources.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE)); } private Optional> loadTranslationFile(String filename) { @@ -112,12 +117,18 @@ public class TranslationManager { return false; } checkedLocales.add(locale); + // Make a copy of the default language file + Map baseTranslations = new HashMap<>(); + if (!locale.equals(defaultLocale)) { + baseTranslations.putAll(getTranslationMap(defaultLocale)); + } Optional> langData = loadTranslationFile(locale.getLanguage() + "-" + locale.getCountry() + "/strings.json"); if (!langData.isPresent()) { langData = loadTranslationFile(locale.getLanguage() + "/strings.json"); } if (langData.isPresent()) { - translationMap.put(locale, langData.get()); + baseTranslations.putAll(langData.get()); + translationMap.put(locale, baseTranslations); return true; } if (locale.equals(defaultLocale)) { From ded86d48722718be0c0f50bc77a3d6353d1b587c Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Mon, 18 Nov 2019 19:50:52 +1000 Subject: [PATCH 13/16] Fixed issues brought up in review --- .../bukkit/BukkitBlockCommandSender.java | 3 ++- .../worldedit/bukkit/BukkitCommandInspector.java | 5 +++-- .../worldedit/bukkit/BukkitCommandSender.java | 3 ++- .../worldedit/bukkit/BukkitServerInterface.java | 5 +++-- .../sk89q/worldedit/cli/CLICommandSender.java | 3 ++- .../com/sk89q/worldedit/cli/CLIWorldEdit.java | 6 +++--- worldedit-core/build.gradle.kts | 12 ++++++------ .../com/sk89q/worldedit/LocalConfiguration.java | 3 +++ .../sk89q/worldedit/command/BrushCommands.java | 2 +- .../sk89q/worldedit/command/GeneralCommands.java | 7 ++++--- .../worldedit/util/PropertiesConfiguration.java | 7 +++++++ .../sk89q/worldedit/util/YAMLConfiguration.java | 8 ++++++++ .../sk89q/worldedit/util/io/ResourceLoader.java | 16 +++++++++------- .../util/translation/TranslationManager.java | 15 +++++++-------- .../src/main/resources/lang/strings.json | 9 ++++++--- .../fabric/mixin/AccessorServerPlayerEntity.java | 2 +- .../fabric/mixin/MixinServerPlayerEntity.java | 1 - .../worldedit/sponge/SpongeCommandSender.java | 3 ++- .../sponge/config/ConfigurateConfiguration.java | 7 +++++++ 19 files changed, 76 insertions(+), 41 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java index e5545a804..549afab2b 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java @@ -21,6 +21,7 @@ package com.sk89q.worldedit.bukkit; import static com.google.common.base.Preconditions.checkNotNull; +import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.platform.AbstractNonPlayerActor; import com.sk89q.worldedit.extension.platform.Locatable; import com.sk89q.worldedit.extent.Extent; @@ -98,7 +99,7 @@ public class BukkitBlockCommandSender extends AbstractNonPlayerActor implements @Override public Locale getLocale() { - return Locale.US; + return WorldEdit.getInstance().getConfiguration().defaultLocale; } @Override diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java index a314b4855..d40d94cb4 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java @@ -20,6 +20,7 @@ package com.sk89q.worldedit.bukkit; import com.sk89q.bukkit.util.CommandInspector; +import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.platform.Actor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -53,7 +54,7 @@ class BukkitCommandInspector implements CommandInspector { public String getShortText(Command command) { Optional mapping = dispatcher.getCommand(command.getName()); if (mapping.isPresent()) { - return reduceToText(mapping.get().getDescription(), Locale.US); + return reduceToText(mapping.get().getDescription(), WorldEdit.getInstance().getConfiguration().defaultLocale); } else { logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'"); return "Help text not available"; @@ -64,7 +65,7 @@ class BukkitCommandInspector implements CommandInspector { public String getFullText(Command command) { Optional mapping = dispatcher.getCommand(command.getName()); if (mapping.isPresent()) { - return reduceToText(mapping.get().getFullHelp(), Locale.US); + return reduceToText(mapping.get().getFullHelp(), WorldEdit.getInstance().getConfiguration().defaultLocale); } else { logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'"); return "Help text not available"; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java index 33dc3594c..bff893151 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java @@ -22,6 +22,7 @@ package com.sk89q.worldedit.bukkit; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.platform.AbstractNonPlayerActor; import com.sk89q.worldedit.session.SessionKey; import com.sk89q.worldedit.util.auth.AuthorizationException; @@ -114,7 +115,7 @@ public class BukkitCommandSender extends AbstractNonPlayerActor { @Override public Locale getLocale() { - return Locale.US; + return WorldEdit.getInstance().getConfiguration().defaultLocale; } @Override diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java index 5a9ca9b93..4adc32fc7 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java @@ -22,6 +22,7 @@ package com.sk89q.worldedit.bukkit; import com.sk89q.bukkit.util.CommandInfo; import com.sk89q.bukkit.util.CommandRegistration; import com.sk89q.worldedit.LocalConfiguration; +import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.command.util.PermissionCondition; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.extension.platform.Actor; @@ -170,8 +171,8 @@ public class BukkitServerInterface implements MultiUserPlatform { command.getAliases().stream() ).toArray(String[]::new); // TODO Handle localisation correctly - return new CommandInfo(reduceToText(command.getUsage(), Locale.US), - reduceToText(command.getDescription(), Locale.US), aliases, + return new CommandInfo(reduceToText(command.getUsage(), WorldEdit.getInstance().getConfiguration().defaultLocale), + reduceToText(command.getDescription(), WorldEdit.getInstance().getConfiguration().defaultLocale), aliases, inspector, permissionsArray); }).collect(Collectors.toList())); } diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java index 2170cf17c..93b52f6ae 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java @@ -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 diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java index 9bff097c1..56853ffe3 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java @@ -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); } diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index 7eb0f967e..b65b4f58f 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -95,20 +95,20 @@ if (project.hasProperty(crowdinApiKey)) { apiKey = "${project.property(crowdinApiKey)}" projectId = "worldedit-core" files = arrayOf( - object { - var name = "strings.json" - var source = "$projectDir/src/main/resources/lang/strings.json" - } + object { + var name = "strings.json" + var source = "${file("src/main/resources/lang/strings.json")}" + } ) } tasks.named("crowdinDownload") { apiKey = "${project.property(crowdinApiKey)}" - destination = "$projectDir/src/main/resources/lang" + destination = "${file("build/resources/main/lang")}" projectId = "worldedit-core" } - tasks.named("processResources").configure { + tasks.named("classes").configure { dependsOn("crowdinDownload") } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java index 0b042c8bb..de5be392f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java @@ -29,6 +29,7 @@ import com.sk89q.worldedit.world.snapshot.SnapshotRepository; import java.io.File; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Objects; import java.util.Set; @@ -76,6 +77,8 @@ public abstract class LocalConfiguration { public boolean allowSymlinks = false; public boolean serverSideCUI = true; public boolean extendedYLimit = false; + public String defaultLocaleName = "default"; + public Locale defaultLocale = Locale.getDefault(); protected String[] getDefaultDisallowedBlocks() { List blockTypes = Lists.newArrayList( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java index 3fa686190..1d4a9a861 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java @@ -118,7 +118,7 @@ public class BrushCommands { tool.setBrush(new SphereBrush(), "worldedit.brush.sphere"); } - player.printInfo(TranslatableComponent.of("worldedit.brush.sphere.equip", TextComponent.of((int) radius))); + player.printInfo(TranslatableComponent.of("worldedit.brush.sphere.equip", TextComponent.of(String.format("%.0f", radius)))); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java index 55cde4d5f..2c15e120d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java @@ -96,7 +96,7 @@ public class GeneralCommands { session.setBlockChangeLimit(limit); Component component = TextComponent.empty().append(TranslatableComponent.of("worldedit.limit.set", TextComponent.of(limit))); if (limit != config.defaultChangeLimit) { - component.append(TranslatableComponent.of("worldedit.limit.return-to-default", TextColor.GRAY)); + component.append(TextComponent.space()).append(TranslatableComponent.of("worldedit.limit.return-to-default", TextColor.GRAY)); } actor.printInfo(component); } @@ -180,7 +180,8 @@ public class GeneralCommands { } boolean useServerCui = session.shouldUseServerCUI(); if (drawSelection != null && drawSelection == useServerCui) { - player.printError(TranslatableComponent.of(useServerCui ? "worldedit.drawsel.enabled.already" : "worldedit.drawsel.disabled.already")); + player.printError(TranslatableComponent.of("worldedit.drawsel." + (useServerCui ? "enabled" : "disabled") + ".already")); + return; } if (useServerCui) { @@ -284,7 +285,7 @@ public class GeneralCommands { return; } if (blocksOnly && itemsOnly) { - actor.printError(TranslatableComponent.of("worldedit.searchitem.b-and-i")); + actor.printError(TranslatableComponent.of("worldedit.searchitem.either-b-or-i")); return; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java index 7953c4d31..ff96ee16a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java @@ -39,6 +39,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Arrays; import java.util.HashSet; +import java.util.Locale; import java.util.Properties; import java.util.Set; @@ -119,6 +120,12 @@ public class PropertiesConfiguration extends LocalConfiguration { allowSymlinks = getBool("allow-symbolic-links", allowSymlinks); serverSideCUI = getBool("server-side-cui", serverSideCUI); extendedYLimit = getBool("extended-y-limit", extendedYLimit); + defaultLocaleName = getString("default-locale", defaultLocaleName); + if (defaultLocaleName.equals("default")) { + defaultLocale = Locale.getDefault(); + } else { + defaultLocale = Locale.forLanguageTag(defaultLocaleName.replace('_', '-')); + } LocalSession.MAX_HISTORY_SIZE = Math.max(15, getInt("history-size", 15)); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java index be676b132..4110b9599 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java @@ -30,6 +30,7 @@ import org.slf4j.Logger; import java.io.IOException; import java.util.HashSet; +import java.util.Locale; /** * A less simple implementation of {@link LocalConfiguration} @@ -125,6 +126,13 @@ public class YAMLConfiguration extends LocalConfiguration { shellSaveType = type.isEmpty() ? null : type; extendedYLimit = config.getBoolean("compat.extended-y-limit", false); + + defaultLocaleName = config.getString("default-locale", defaultLocaleName); + if (defaultLocaleName.equals("default")) { + defaultLocale = Locale.getDefault(); + } else { + defaultLocale = Locale.forLanguageTag(defaultLocaleName.replace('_', '-')); + } } public void unload() { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java index 1f3555353..0ce49b115 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/ResourceLoader.java @@ -27,16 +27,19 @@ public class ResourceLoader { private ResourceLoader() { } + private static URL getResourceForgeHack(String location) throws IOException { + return new URL("modjar://worldedit/" + location); + } + public static URL getResource(Class clazz, String name) throws IOException { URL url = clazz.getResource(name); if (url == null) { try { - return new URL("modjar://worldedit/" + clazz.getName().substring(0, clazz.getName().lastIndexOf('.')).replace(".", "/") + "/" - + name); + return getResourceForgeHack(clazz.getName().substring(0, clazz.getName().lastIndexOf('.')).replace(".", "/") + + "/" + name); } catch (Exception e) { - // Not forge. + throw new IOException("Could not find " + name); } - throw new IOException("Could not find " + name); } return url; } @@ -45,11 +48,10 @@ public class ResourceLoader { URL url = ResourceLoader.class.getResource("/" + name); if (url == null) { try { - return new URL("modjar://worldedit/" + name); + return getResourceForgeHack(name); } catch (Exception e) { - // Not forge. + throw new IOException("Could not find " + name); } - throw new IOException("Could not find " + name); } return url; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java index 1a2dbf9b8..c253d3091 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java @@ -30,7 +30,10 @@ import com.sk89q.worldedit.util.formatting.text.renderer.FriendlyComponentRender import com.sk89q.worldedit.util.io.ResourceLoader; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.lang.reflect.Type; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -81,19 +84,15 @@ public class TranslationManager { return translations; } - private Map parseTranslationFile(File file) throws IOException { - return filterTranslations(gson.fromJson(Files.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE)); - } - - private Map parseTranslationFile(URL file) throws IOException { - return filterTranslations(gson.fromJson(Resources.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE)); + private Map parseTranslationFile(InputStream inputStream) { + return filterTranslations(gson.fromJson(new InputStreamReader(inputStream), STRING_MAP_TYPE)); } private Optional> loadTranslationFile(String filename) { Map baseTranslations; try { - baseTranslations = parseTranslationFile(ResourceLoader.getResourceRoot("lang/" + filename)); + baseTranslations = parseTranslationFile(ResourceLoader.getResourceRoot("lang/" + filename).openStream()); } catch (IOException e) { // Seem to be missing base. If the user has provided a file use that. baseTranslations = new HashMap<>(); @@ -102,7 +101,7 @@ public class TranslationManager { File localFile = worldEdit.getWorkingDirectoryFile("lang/" + filename); if (localFile.exists()) { try { - baseTranslations.putAll(parseTranslationFile(localFile)); + baseTranslations.putAll(parseTranslationFile(new FileInputStream(localFile))); } catch (IOException e) { // Failed to parse custom language file. Worth printing. e.printStackTrace(); diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index f8a005983..968b00ffc 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -37,7 +37,7 @@ "worldedit.drawsel.enabled.already": "Server CUI already enabled.", "worldedit.limit.too-high": "Your maximum allowable limit is {0}.", "worldedit.limit.set": "Block change limit set to {0}.", - "worldedit.limit.return-to-default": " (Use //limit to go back to the default.)", + "worldedit.limit.return-to-default": "(Use //limit to go back to the default.)", "worldedit.timeout.too-high": "Your maximum allowable timeout is {0}ms.", "worldedit.timeout.set": "Timeout time set to {0} ms.", "worldedit.timeout.return-to-default": " (Use //timeout to go back to the default.)", @@ -52,7 +52,7 @@ "worldedit.toggleplace.pos1": "Now placing at pos #1.", "worldedit.toggleplace.player": "Now placing at the block you stand in.", "worldedit.searchitem.too-short": "Enter a longer search string (len > 2).", - "worldedit.searchitem.b-and-i": "You cannot use both the 'b' and 'i' flags simultaneously.", + "worldedit.searchitem.either-b-or-i": "You cannot use both the 'b' and 'i' flags simultaneously.", "worldedit.searchitem.searching": "(Please wait... searching items.)", "worldedit.watchdog.no-hook": "This platform has no watchdog hook.", "worldedit.watchdog.active.already": "Watchdog hook already active.", @@ -323,5 +323,8 @@ "worldedit.help.command-not-found": "The command '{0}' could not be found.", "worldedit.help.no-subcommands": "'{0}' has no sub-commands. (Maybe '{1}' is for a parameter?)", - "worldedit.help.subcommand-not-found": "The sub-command '{0}' under '{1}' could not be found." + "worldedit.help.subcommand-not-found": "The sub-command '{0}' under '{1}' could not be found.", + + "worldedit.cli.stopping": "Stopping!", + "worldedit.cli.unknown-command": "Unknown command!" } \ No newline at end of file diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerEntity.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerEntity.java index a7e86af41..1e9b844b3 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerEntity.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerEntity.java @@ -26,6 +26,6 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(ServerPlayerEntity.class) public interface AccessorServerPlayerEntity { - @Accessor("clientLanguage") + @Accessor String getClientLanguage(); } diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java index 822bb0954..fbad989c1 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java @@ -27,7 +27,6 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Hand; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java index fb3d31695..e9b8d62a6 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeCommandSender.java @@ -22,6 +22,7 @@ package com.sk89q.worldedit.sponge; import static com.google.common.base.Preconditions.checkArgument; 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; @@ -144,7 +145,7 @@ public class SpongeCommandSender implements Actor { @Override public Locale getLocale() { - return Locale.US; + return WorldEdit.getInstance().getConfiguration().defaultLocale; } @Override diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java index 377633000..f93c21612 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java @@ -34,6 +34,7 @@ import org.slf4j.Logger; import java.io.IOException; import java.util.HashSet; +import java.util.Locale; public class ConfigurateConfiguration extends LocalConfiguration { @@ -131,5 +132,11 @@ public class ConfigurateConfiguration extends LocalConfiguration { shellSaveType = type.equals("") ? null : type; extendedYLimit = node.getNode("compat", "extended-y-limit").getBoolean(false); + defaultLocaleName = node.getNode("default-locale").getString(defaultLocaleName); + if (defaultLocaleName.equals("default")) { + defaultLocale = Locale.getDefault(); + } else { + defaultLocale = Locale.forLanguageTag(defaultLocaleName.replace('_', '-')); + } } } \ No newline at end of file From 59b8465493b667283441c8b4ffa02b8d3e7d5565 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 21 Nov 2019 13:50:28 +0000 Subject: [PATCH 14/16] =?UTF-8?q?Merge=20remote-tracking=20branch=20'upstr?= =?UTF-8?q?eam/feature/translatable-text'=20int=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/build.gradle.kts | 2 +- .../worldedit/command/SchematicCommands.java | 11 ++++--- .../sk89q/worldedit/command/ToolCommands.java | 29 +++++++++---------- .../worldedit/command/tool/BrushTool.java | 4 +-- .../command/tool/NavigationWand.java | 4 +-- .../platform/PlatformCommandManager.java | 11 +++++-- .../component/BlockDistributionResult.java | 4 +-- .../src/main/resources/lang/strings.json | 8 +++-- 8 files changed, 39 insertions(+), 34 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index acf25593a..0df3521c6 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -53,5 +53,5 @@ dependencies { // implementation("net.minecraftforge.gradle:ForgeGradle:3.0.143") // implementation("net.fabricmc:fabric-loom:$loomVersion") // implementation("net.fabricmc:sponge-mixin:$mixinVersion") -// implementation("gradle.plugin.com.mendhak.gradlecrowdin:plugin:0.1.0") + implementation("gradle.plugin.com.mendhak.gradlecrowdin:plugin:0.1.0") } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java index f4c8f2c84..af40b862a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java @@ -827,28 +827,27 @@ public class SchematicCommands { } if (files.isEmpty()) { - actor.printError(BBC.SCHEMATIC_NONE.s()); + actor.printError(TranslatableComponent.of("worldedit.schematic.delete.does-not-exist", TextComponent.of(filename))); return; } for (File f : files) { if (!MainUtil.isInSubDirectory(working, f) || !f.exists()) { - actor.printError("Schematic " + filename + " does not exist! (" + f.exists() + "|" + f + "|" + !MainUtil.isInSubDirectory(working, f) - + ")"); + actor.printError(TranslatableComponent.of("worldedit.schematic.delete.does-not-exist", TextComponent.of(filename))); continue; } if (Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS && !MainUtil.isInSubDirectory(dir, f) && !actor.hasPermission("worldedit.schematic.delete.other")) { BBC.NO_PERM.send(actor, "worldedit.schematic.delete.other"); continue; } - if (!delete(f)) { - actor.printError("Deletion of " + filename + " failed! Maybe it is read-only."); + if (!deleteFile(f)) { + actor.printError(TranslatableComponent.of("worldedit.schematic.delete.failed", TextComponent.of(filename))); continue; } BBC.FILE_DELETED.send(actor, filename); } } - private boolean delete(File file) { + private boolean deleteFile(File file) { if (file.delete()) { new File(file.getParentFile(), "." + file.getName() + ".cached").delete(); return true; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java index 8f06f5b9c..45a2c9c8d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java @@ -27,6 +27,7 @@ import com.sk89q.worldedit.LocalConfiguration; import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; +import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.command.tool.BlockDataCyler; import com.sk89q.worldedit.command.tool.BlockReplacer; import com.sk89q.worldedit.command.tool.InvalidToolBindException; @@ -126,7 +127,7 @@ public class ToolCommands { static void setToolNone(Player player, LocalSession session, boolean isBrush) throws InvalidToolBindException { - session.setTool(player.getItemInHand(HandSide.MAIN_HAND).getType(), null); + session.setTool(player, null); player.printInfo(TranslatableComponent.of(isBrush ? "worldedit.brush.none.equip" : "worldedit.tool.none.equip")); } private final WorldEdit we; @@ -142,9 +143,8 @@ public class ToolCommands { ) @CommandPermissions("worldedit.setwand") public void selwand(Player player, LocalSession session) throws WorldEditException { - final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); - session.setTool(itemType, SelectionWand.INSTANCE); + session.setTool(player, SelectionWand.INSTANCE); player.printInfo(TranslatableComponent.of("worldedit.tool.selwand.equip", TextComponent.of(itemType.getName()))); } @@ -156,7 +156,7 @@ public class ToolCommands { @CommandPermissions("worldedit.setwand") public void navwand(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, NavigationWand.INSTANCE); player.printInfo(TranslatableComponent.of("worldedit.tool.navWand.equip", TextComponent.of(itemType.getName()))); } @@ -168,7 +168,7 @@ public class ToolCommands { @CommandPermissions("worldedit.tool.info") public void info(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, new QueryTool()); player.printInfo(TranslatableComponent.of("worldedit.tool.info.equip", TextComponent.of(itemType.getName()))); } @@ -179,9 +179,9 @@ public class ToolCommands { ) @CommandPermissions("worldedit.tool.inspect") public void inspectBrush(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, new InspectBrush()); - BBC.TOOL_INSPECT.send(player, itemStack.getType().getName()); + player.printInfo(TranslatableComponent.of("worldedit.tool.inspect.equip", TextComponent.of(itemType.getName()))); } @Command( @@ -193,7 +193,7 @@ public class ToolCommands { @Arg(desc = "Type of tree to generate", def = "tree") TreeGenerator.TreeType type) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, new TreePlanter(type)); player.printInfo(TranslatableComponent.of("worldedit.tool.tree.equip", TextComponent.of(itemType.getName()))); } @@ -207,7 +207,7 @@ public class ToolCommands { @Arg(desc = "The pattern of blocks to place") Pattern pattern) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, new BlockReplacer(pattern)); player.printInfo(TranslatableComponent.of("worldedit.tool.repl.equip", TextComponent.of(itemType.getName()))); } @@ -219,7 +219,7 @@ public class ToolCommands { @CommandPermissions("worldedit.tool.data-cycler") public void cycler(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, new BlockDataCyler()); player.printInfo(TranslatableComponent.of("worldedit.tool.data-cycler.equip", TextComponent.of(itemType.getName()))); } @@ -243,7 +243,7 @@ public class ToolCommands { return; } - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, new FloodFillTool(range, pattern)); player.printInfo(TranslatableComponent.of("worldedit.tool.floodfill.equip", TextComponent.of(itemType.getName()))); } @@ -255,7 +255,7 @@ public class ToolCommands { @CommandPermissions("worldedit.tool.deltree") public void deltree(Player player, LocalSession session) throws WorldEditException { - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, new FloatingTreeRemover()); player.printInfo(TranslatableComponent.of("worldedit.tool.deltree.equip", TextComponent.of(itemType.getName()))); } @@ -266,8 +266,7 @@ public class ToolCommands { ) @CommandPermissions("worldedit.tool.farwand") public void farwand(Player player, LocalSession session) throws WorldEditException { - - BaseItemStack itemStack = player.getItemInHand(HandSide.MAIN_HAND); + final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); session.setTool(player, new DistanceWand()); player.printInfo(TranslatableComponent.of("worldedit.tool.farwand.equip", TextComponent.of(itemType.getName()))); } @@ -285,7 +284,7 @@ public class ToolCommands { Pattern secondary) throws WorldEditException { final ItemType itemType = player.getItemInHand(HandSide.MAIN_HAND).getType(); - session.setTool(itemType, new LongRangeBuildTool(primary, secondary)); + session.setTool(player, new LongRangeBuildTool(primary, secondary)); player.printInfo(TranslatableComponent.of("worldedit.tool.lrbuild.equip", TextComponent.of(itemType.getName()))); String primaryName = "pattern"; String secondaryName = "pattern"; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java index 4c2f2e4a8..0335df5ea 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java @@ -508,7 +508,7 @@ public class BrushTool implements DoubleActionTraceTool, ScrollTool, MovableTool if (target == null) { editSession.cancel(); - player.print(BBC.NO_BLOCK.s()); + player.printError(TranslatableComponent.of("worldedit.tool.no-block")); return true; } BlockBag bag = session.getBlockBag(player); @@ -543,7 +543,7 @@ public class BrushTool implements DoubleActionTraceTool, ScrollTool, MovableTool WorldEdit.getInstance().checkMaxBrushRadius(size); brush.build(editSession, target.toBlockPoint(), current.getMaterial(), size); } catch (MaxChangedBlocksException e) { - player.printError("Max blocks change limit reached."); + player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes")); } finally { session.remember(editSession); if (bag != null) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java index 2a73446bb..d6aa67059 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java @@ -40,7 +40,7 @@ public enum NavigationWand implements DoubleActionTraceTool { if (pos != null) { player.findFreePosition(pos); } else { - player.printError("No block in sight (or too far)!"); + player.printError(TranslatableComponent.of("worldedit.jumpto.none")); } return true; } @@ -53,7 +53,7 @@ public enum NavigationWand implements DoubleActionTraceTool { } if (!player.passThroughForwardWall(Math.max(1, maxDist - 10))) { - player.printError("Nothing to pass through (or too far)!"); + player.printError(TranslatableComponent.of("worldedit.thru.obstructed")); } return true; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java index e8e374fbd..230a4c949 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java @@ -774,9 +774,14 @@ public final class PlatformCommandManager { editSession.flushQueue(); session.remember(editSession); - long time = System.currentTimeMillis() - start; - if (time > 1000) { - BBC.ACTION_COMPLETE.send(actor, time / 1000D); + long timems = System.currentTimeMillis() - start; + if (timems > 1000) { + actor.printDebug(TranslatableComponent.of( + "worldedit.command.time-elapsed", + TextComponent.of(timems + "m"), + TextComponent.of(-1), + TextComponent.of(Math.round(-1)) + )); } worldEdit.flushBlockBag(actor, editSession); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java index 797557a52..7b9d27ec7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java @@ -32,11 +32,11 @@ import java.util.List; public class BlockDistributionResult extends PaginationBox { - private final List> distribution; + private final List distribution; private final int totalBlocks; private final boolean separateStates; - public BlockDistributionResult(List> distribution, boolean separateStates) { + public BlockDistributionResult(List distribution, boolean separateStates) { super("Block Distribution", "//distr -p %page%" + (separateStates ? " -d" : "")); this.distribution = distribution; // note: doing things like region.getArea is inaccurate for non-cuboids. diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index 968b00ffc..7c6ea3270 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -96,6 +96,7 @@ "worldedit.schematic.save.already-exists": "That schematic already exists. Use the -f flag to overwrite it.", "worldedit.schematic.save.failed-directory": "Could not create folder for schematics!", "worldedit.schematic.save.saving": "(Please wait... saving schematic.)", + "worldedit.schematic.delete.empty": "Schematic {0} not found!", "worldedit.schematic.delete.does-not-exist": "Schematic {0} does not exist!", "worldedit.schematic.delete.failed": "Deletion of {0} failed! Is it read-only?", "worldedit.schematic.delete.deleted": "{0} has been deleted.", @@ -219,13 +220,13 @@ "worldedit.generate.changed": "{0} columns affected.", "worldedit.reload.config": "Configuration reloaded!", - "worldedit.report.written": "WorldEdit report written to {0}", + "worldedit.report.written": "FAWE report written to {0}", "worldedit.report.error": "Failed to write report: {0}", - "worldedit.report.callback": "WorldEdit report: {0}.report", + "worldedit.report.callback": "FAWE report: {0}.report", "worldedit.timezone.invalid": "Invalid timezone", "worldedit.timezone.set": "Timezone set for this session to: {0}", "worldedit.timezone.current": "The current time in that timezone is: {0}", - "worldedit.version.version": "WorldEdit version {0}", + "worldedit.version.version": "FAWE version:\n - Date {0}\n - Commit {1}\n - Build {2}\n - Platform {3}", "worldedit.command.time-elapsed": "{0}s elapsed (history: {1} changed; {2} blocks/sec).", "worldedit.command.permissions": "You are not permitted to do that. Are you in the right mode?", @@ -250,6 +251,7 @@ "worldedit.tool.tree.equip": "Tree tool bound to {0}.", "worldedit.tool.tree.obstructed": "A tree can't go there.", "worldedit.tool.info.equip": "Info tool bound to {0}.", + "worldedit.tool.inspect.equip": "Inspect tool bound to {0}.", "worldedit.tool.info.blockstate.hover": "Block state", "worldedit.tool.info.internalid.hover": "Internal ID", "worldedit.tool.info.light.hover": "Block Light/Light Above", From 6f32783e523484de524ccacc6d174696e5c57a4d Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 21 Nov 2019 14:07:07 +0000 Subject: [PATCH 15/16] Fix compile --- .../worldedit/command/SelectionCommands.java | 30 ++++--- .../worldedit/command/WorldEditCommands.java | 1 - .../component/BlockDistributionResult.java | 90 ------------------- .../src/main/resources/lang/strings.json | 2 +- 4 files changed, 17 insertions(+), 106 deletions(-) delete mode 100644 worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java index 3bfd7144c..58a867d72 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java @@ -46,7 +46,6 @@ import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Locatable; import com.sk89q.worldedit.extension.platform.permission.ActorSelectorLimits; import com.sk89q.worldedit.extent.AbstractDelegateExtent; -import com.sk89q.worldedit.command.util.WorldEditAsyncCommandBuilder; import com.sk89q.worldedit.extent.clipboard.Clipboard; import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.internal.annotation.Direction; @@ -300,7 +299,7 @@ public class SelectionCommands { session.setTool(itemType, NavigationWand.INSTANCE); player.printInfo(TranslatableComponent.of("worldedit.wand.navwand.info")); } else { - session.setTool(itemType, new SelectionWand()); + session.setTool(itemType, SelectionWand.INSTANCE); player.printInfo(TranslatableComponent.of("worldedit.wand.selwand.info")); } if (!player.hasPermission("fawe.tips")) @@ -453,7 +452,7 @@ public class SelectionCommands { desc = "Get information about the selection" ) @CommandPermissions("worldedit.selection.size") - public void size(Player player, LocalSession session, + public void size(Actor actor, World world, LocalSession session, @Switch(name = 'c', desc = "Get clipboard info instead") boolean clipboardInfo) throws WorldEditException { Region region; @@ -477,16 +476,17 @@ public class SelectionCommands { region = clipboard.getRegion(); BlockVector3 size = region.getMaximumPoint() .subtract(region.getMinimumPoint()). - add(1, 1, 1); + add(1, 1, 1); BlockVector3 origin = clipboard.getOrigin(); String sizeStr = size.getBlockX() + "*" + size.getBlockY() + "*" + size.getBlockZ(); String originStr = origin.getBlockX() + "," + origin.getBlockY() + "," + origin.getBlockZ(); long numBlocks = ((long) size.getBlockX() * size.getBlockY() * size.getBlockZ()); - - BlockVector3 origin = clipboard.getOrigin(); - actor.printInfo(TranslatableComponent.of("worldedit.size.offset", TextComponent.of(origin.toString()))); + actor.printInfo(TranslatableComponent.of("worldedit.size.offset", TextComponent.of(name), TextComponent.of(sizeStr), TextComponent.of(originStr), TextComponent.of(numBlocks))); + index++; + } + return; } else { region = session.getSelection(world); @@ -524,11 +524,13 @@ public class SelectionCommands { desc = "Get the distribution of blocks in the selection" ) @CommandPermissions("worldedit.analysis.distr") - public void distr(Player player, LocalSession session, EditSession editSession, + public void distr(Actor actor, World world, LocalSession session, EditSession editSession, @Switch(name = 'c', desc = "Get the distribution of the clipboard instead") - boolean clipboardDistr, + boolean clipboardDistr, @Switch(name = 'd', desc = "Separate blocks by state") - boolean separateStates) throws WorldEditException { + boolean separateStates, + @ArgFlag(name = 'p', desc = "Gets page from a previous distribution.", def = "") + Integer page) throws WorldEditException { List distribution; Region region; @@ -538,7 +540,7 @@ public class SelectionCommands { region = clipboard.getRegion(); new ExtentTraverser(editSession).setNext(new AbstractDelegateExtent(clipboard)); } else { - region = session.getSelection(player.getWorld()); + region = session.getSelection(world); } if (separateStates) distribution = (List) editSession.getBlockDistributionWithData(region); @@ -553,16 +555,16 @@ public class SelectionCommands { BlockDistributionResult res = new BlockDistributionResult(distribution, separateStates); if (!actor.isPlayer()) res.formatForConsole(); - return res.create(finalPage); + actor.print(res.create(page)); } private static class BlockDistributionResult extends PaginationBox { - private final List> distribution; + private final List distribution; private final int totalBlocks; private final boolean separateStates; - BlockDistributionResult(List> distribution, boolean separateStates) { + BlockDistributionResult(List distribution, boolean separateStates) { super("Block Distribution", "//distr -p %page%" + (separateStates ? " -d" : "")); this.distribution = distribution; // note: doing things like region.getArea is inaccurate for non-cuboids. diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java index 57a496791..ec9977dd6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java @@ -143,7 +143,6 @@ public class WorldEditCommands { public void report(Actor actor) throws WorldEditException, IOException { String dest = IncendoPaster.debugPaste(); actor.printInfo(TranslatableComponent.of("worldedit.report.written", TextComponent.of(dest))); - BBC.DOWNLOAD_LINK.send(actor, ); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java deleted file mode 100644 index 7b9d27ec7..000000000 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/BlockDistributionResult.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * WorldEdit, a Minecraft world manipulation toolkit - * Copyright (C) sk89q - * Copyright (C) WorldEdit team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldedit.util.formatting.component; - -import com.google.common.base.Strings; -import com.sk89q.worldedit.util.Countable; -import com.sk89q.worldedit.util.formatting.text.Component; -import com.sk89q.worldedit.util.formatting.text.TextComponent; -import com.sk89q.worldedit.util.formatting.text.event.HoverEvent; -import com.sk89q.worldedit.util.formatting.text.format.TextColor; -import com.sk89q.worldedit.world.block.BlockState; -import com.sk89q.worldedit.world.block.BlockType; - -import java.util.List; - -public class BlockDistributionResult extends PaginationBox { - - private final List distribution; - private final int totalBlocks; - private final boolean separateStates; - - public BlockDistributionResult(List distribution, boolean separateStates) { - super("Block Distribution", "//distr -p %page%" + (separateStates ? " -d" : "")); - this.distribution = distribution; - // note: doing things like region.getArea is inaccurate for non-cuboids. - this.totalBlocks = distribution.stream().mapToInt(Countable::getAmount).sum(); - this.separateStates = separateStates; - setComponentsPerPage(7); - } - - @Override - public Component getComponent(int number) { - Countable c = distribution.get(number); - TextComponent.Builder line = TextComponent.builder(); - - final int count = c.getAmount(); - - final double perc = count / (double) totalBlocks * 100; - final int maxDigits = (int) (Math.log10(totalBlocks) + 1); - final int curDigits = (int) (Math.log10(count) + 1); - line.append(String.format("%s%.3f%% ", perc < 10 ? " " : "", perc), TextColor.GOLD); - final int space = maxDigits - curDigits; - String pad = Strings.repeat(" ", space == 0 ? 2 : 2 * space + 1); - line.append(String.format("%s%s", count, pad), TextColor.YELLOW); - - final BlockState state = c.getID(); - final BlockType blockType = state.getBlockType(); - TextComponent blockName = TextComponent.of(blockType.getName(), TextColor.LIGHT_PURPLE); - TextComponent toolTip; - if (separateStates && state != blockType.getDefaultState()) { - toolTip = TextComponent.of(state.getAsString(), TextColor.GRAY); - blockName = blockName.append(TextComponent.of("*", TextColor.LIGHT_PURPLE)); - } else { - toolTip = TextComponent.of(blockType.getId(), TextColor.GRAY); - } - blockName = blockName.hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, toolTip)); - line.append(blockName); - - return line.build(); - } - - @Override - public int getComponentsSize() { - return distribution.size(); - } - - @Override - public Component create(int page) throws InvalidComponentException { - super.getContents().append(TextComponent.of("Total Block Count: " + totalBlocks, TextColor.GRAY)) - .append(TextComponent.newline()); - return super.create(page); - } -} diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index 7c6ea3270..416a7a989 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -115,7 +115,7 @@ "worldedit.shift.shifted": "Region shifted.", "worldedit.outset.outset": "Region outset.", "worldedit.inset.inset": "Region inset.", - "worldedit.size.offset": "Offset: {0}", + "worldedit.size.offset": "{0}: {1} @ {2} ({3} blocks)", "worldedit.size.type": "Type: {0}", "worldedit.size.size": "Size: {0}", "worldedit.size.distance": "Cuboid distance: {0}", From 1341e38a90f949b364bff8b5a335819abfa3661b Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 21 Nov 2019 19:56:10 +0000 Subject: [PATCH 16/16] fix compile --- .../com/boydti/fawe/bukkit/BukkitCommand.java | 1 + .../bukkit/BukkitBlockCommandSender.java | 2 +- .../sk89q/worldedit/bukkit/BukkitPlayer.java | 33 +- .../src/main/java/com/boydti/fawe/Fawe.java | 1 + .../main/java/com/boydti/fawe/FaweAPI.java | 4 +- .../main/java/com/boydti/fawe/FaweCache.java | 19 +- .../boydti/fawe/command/AnvilCommands.java | 46 +-- .../com/boydti/fawe/command/CFICommands.java | 3 +- .../com/boydti/fawe/command/Rollback.java | 21 +- .../main/java/com/boydti/fawe/config/BBC.java | 64 +++- .../com/boydti/fawe/object/FaweCommand.java | 3 +- .../fawe/object/brush/CatenaryBrush.java | 7 +- .../fawe/object/brush/CopyPastaBrush.java | 5 +- .../boydti/fawe/object/brush/HeightBrush.java | 3 +- .../fawe/object/brush/InspectBrush.java | 10 +- .../boydti/fawe/object/brush/LineBrush.java | 5 +- .../boydti/fawe/object/brush/SplineBrush.java | 7 +- .../fawe/object/brush/SurfaceSpline.java | 5 +- .../fawe/object/brush/scroll/Scroll.java | 7 +- .../fawe/object/brush/sweep/SweepBrush.java | 7 +- .../exception/FaweBlockBagException.java | 5 +- .../exception/FaweChunkLoadException.java | 5 +- .../fawe/object/exception/FaweException.java | 19 +- .../object/extent/MemoryCheckingExtent.java | 5 +- .../boydti/fawe/object/extent/NullExtent.java | 4 +- .../object/progress/ChatProgressTracker.java | 6 +- .../progress/DefaultProgressTracker.java | 9 +- .../regions/selector/FuzzyRegionSelector.java | 5 +- .../object/schematic/visualizer/SchemVis.java | 7 +- .../fawe/object/visitor/DFSVisitor.java | 14 +- .../boydti/fawe/util/EditSessionBuilder.java | 3 +- .../java/com/boydti/fawe/util/MainUtil.java | 8 +- .../java/com/sk89q/worldedit/EditSession.java | 9 +- .../worldedit/command/ApplyBrushCommands.java | 6 +- .../worldedit/command/BiomeCommands.java | 4 +- .../worldedit/command/BrushCommands.java | 27 +- .../worldedit/command/ChunkCommands.java | 2 +- .../worldedit/command/ClipboardCommands.java | 45 +-- .../worldedit/command/GeneralCommands.java | 17 +- .../worldedit/command/GenerationCommands.java | 9 +- .../worldedit/command/HistoryCommands.java | 25 +- .../worldedit/command/NavigationCommands.java | 1 + .../worldedit/command/PaintBrushCommands.java | 8 +- .../worldedit/command/RegionCommands.java | 32 +- .../worldedit/command/SchematicCommands.java | 51 +-- .../worldedit/command/ScriptingCommands.java | 1 + .../worldedit/command/SelectionCommands.java | 18 +- .../worldedit/command/SnapshotCommands.java | 3 +- .../command/SuperPickaxeCommands.java | 1 + .../sk89q/worldedit/command/ToolCommands.java | 1 + .../worldedit/command/ToolUtilCommands.java | 37 +- .../worldedit/command/UtilityCommands.java | 9 +- .../worldedit/command/WorldEditCommands.java | 1 + .../command/tool/BlockDataCyler.java | 1 + .../worldedit/command/tool/BrushTool.java | 3 +- .../worldedit/command/tool/DistanceWand.java | 1 + .../command/tool/FloatingTreeRemover.java | 1 + .../command/tool/LongRangeBuildTool.java | 1 + .../worldedit/command/tool/TreePlanter.java | 1 + .../command/util/AsyncCommandBuilder.java | 2 +- .../command/util/annotation/Confirm.java | 9 +- .../com/sk89q/worldedit/entity/Player.java | 3 +- .../factory/parser/DefaultBlockParser.java | 5 +- .../parser/mask/DefaultMaskParser.java | 3 +- .../platform/AbstractNonPlayerActor.java | 2 +- .../platform/AbstractPlayerActor.java | 3 +- .../worldedit/extension/platform/Actor.java | 3 +- .../platform/PlatformCommandManager.java | 3 +- .../extension/platform/PlatformManager.java | 6 +- .../extension/platform/PlayerProxy.java | 2 +- .../extent/clipboard/io/ClipboardFormats.java | 17 +- .../worldedit/function/factory/Deform.java | 2 +- .../function/operation/ForwardExtentCopy.java | 6 +- .../function/visitor/BreadthFirstSearch.java | 3 +- .../function/visitor/EntityVisitor.java | 3 +- .../function/visitor/FlatRegionVisitor.java | 3 +- .../function/visitor/RegionVisitor.java | 3 +- .../ConvexPolyhedralRegionSelector.java | 1 + .../selector/CylinderRegionSelector.java | 1 + .../selector/EllipsoidRegionSelector.java | 1 + .../ExtendingCuboidRegionSelector.java | 1 + .../selector/Polygonal2DRegionSelector.java | 1 + .../text/TranslatableComponent.java | 140 ++++++++ .../src/main/resources/lang/strings.json | 335 ++++++++++++++++++ 84 files changed, 930 insertions(+), 286 deletions(-) create mode 100644 worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/TranslatableComponent.java diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java index 8044b4829..ae622c7b6 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitCommand.java @@ -1,6 +1,7 @@ package com.boydti.fawe.bukkit; import com.boydti.fawe.config.BBC; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.boydti.fawe.object.FaweCommand; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitBlockCommandSender; diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java index b6c0a68eb..053edcfad 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java @@ -77,7 +77,7 @@ public class BukkitBlockCommandSender extends AbstractNonPlayerActor implements @Override public void print(String msg) { for (String part : msg.split("\n")) { - print(TextComponent.of(part, TextColor.LIGHT_PURPLE)); + print(TextComponent.of(part, TextColor.GRAY)); } } diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java index 1bb75d1f2..3da921251 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java @@ -21,6 +21,8 @@ package com.sk89q.worldedit.bukkit; import com.boydti.fawe.Fawe; import com.boydti.fawe.bukkit.FaweBukkit; +import com.boydti.fawe.config.BBC; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.RunnableVal; import com.boydti.fawe.util.TaskManager; @@ -40,11 +42,17 @@ import com.sk89q.worldedit.session.SessionKey; import com.sk89q.worldedit.util.HandSide; import com.sk89q.worldedit.util.formatting.WorldEditText; import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TextComponent; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.util.formatting.text.adapter.bukkit.TextAdapter; +import com.sk89q.worldedit.util.formatting.text.serializer.gson.GsonComponentSerializer; +import com.sk89q.worldedit.util.formatting.text.serializer.legacy.LegacyComponentSerializer; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockStateHolder; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.gamemode.GameMode; @@ -167,28 +175,25 @@ public class BukkitPlayer extends AbstractPlayerActor { @Override public void print(String msg) { - for (String part : msg.split("\n")) { - player.sendMessage("\u00A7d" + part); - } + print(LegacyComponentSerializer.legacy().deserialize("&7" + msg, '&')); } @Override public void printDebug(String msg) { - for (String part : msg.split("\n")) { - player.sendMessage("\u00A77" + part); - } + print(LegacyComponentSerializer.legacy().deserialize("&3" + msg, '&')); } @Override public void printError(String msg) { - for (String part : msg.split("\n")) { - player.sendMessage("\u00A7c" + part); - } + print(LegacyComponentSerializer.legacy().deserialize("&c" + msg, '&')); } @Override public void print(Component component) { - TextAdapter.sendComponent(player, WorldEditText.format(component, getLocale())); + Component prefix = TranslatableComponent.of("fawe.prefix"); + component = TextComponent.builder().append(prefix).append(component).build(); + component = BBC.color(component, getLocale()); + TextAdapter.sendComponent(player, component); } @Override @@ -366,10 +371,10 @@ public class BukkitPlayer extends AbstractPlayerActor { } @Override - public void sendTitle(String title, String sub) { - player.sendTitle(ChatColor.GOLD + title, ChatColor.GOLD + sub, 0, 70, 20); - Bukkit.getServer().dispatchCommand(player, "title " + getName() + " subtitle [{\"text\":\"" + sub + "\",\"color\":\"gold\"}]"); - Bukkit.getServer().dispatchCommand(player, "title " + getName() + " title [{\"text\":\"" + title + "\",\"color\":\"gold\"}]"); + public void sendTitle(Component title, Component sub) { + String titleStr = WorldEditText.reduceToText(title, getLocale()); + String subStr = WorldEditText.reduceToText(sub, getLocale()); + player.sendTitle(titleStr, subStr, 0, 70, 20); } @Override diff --git a/worldedit-core/src/main/java/com/boydti/fawe/Fawe.java b/worldedit-core/src/main/java/com/boydti/fawe/Fawe.java index 69754c103..820696abe 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/Fawe.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/Fawe.java @@ -2,6 +2,7 @@ package com.boydti.fawe; import com.boydti.fawe.beta.implementation.queue.QueueHandler; import com.boydti.fawe.config.BBC; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.brush.visualization.VisualQueue; import com.boydti.fawe.regions.general.integrations.plotquared.PlotSquaredFeature; diff --git a/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java b/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java index 62bce6fea..d513718e1 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java @@ -2,6 +2,8 @@ package com.boydti.fawe; import com.boydti.fawe.beta.IQueueExtent; import com.boydti.fawe.config.BBC; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.RegionWrapper; import com.boydti.fawe.object.changeset.DiskStorageHistory; @@ -232,7 +234,7 @@ public class FaweAPI { * @param reason * @see EditSession#getRegionExtent() To get the FaweExtent for an EditSession */ - public static void cancelEdit(Extent extent, BBC reason) { + public static void cancelEdit(Extent extent, Component reason) { try { WEManager.IMP.cancelEdit(extent, new FaweException(reason)); } catch (WorldEditException ignore) { diff --git a/worldedit-core/src/main/java/com/boydti/fawe/FaweCache.java b/worldedit-core/src/main/java/com/boydti/fawe/FaweCache.java index 658a45046..e15476b1f 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/FaweCache.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/FaweCache.java @@ -5,6 +5,7 @@ import static org.slf4j.LoggerFactory.getLogger; import com.boydti.fawe.beta.Trimable; import com.boydti.fawe.config.BBC; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.collection.BitArray4096; import com.boydti.fawe.object.collection.CleanableThreadLocal; @@ -199,15 +200,15 @@ public enum FaweCache implements Trimable { */ public static final FaweChunkLoadException CHUNK = new FaweChunkLoadException(); public static final FaweBlockBagException BLOCK_BAG = new FaweBlockBagException(); - public static final FaweException MANUAL = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MANUAL); - public static final FaweException NO_REGION = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_NO_REGION); - public static final FaweException OUTSIDE_REGION = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_OUTSIDE_REGION); - public static final FaweException MAX_CHECKS = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_CHECKS); - public static final FaweException MAX_CHANGES = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_CHANGES); - public static final FaweException LOW_MEMORY = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_LOW_MEMORY); - public static final FaweException MAX_ENTITIES = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_ENTITIES); - public static final FaweException MAX_TILES = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_TILES); - public static final FaweException MAX_ITERATIONS = new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_ITERATIONS); + public static final FaweException MANUAL = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.manual")); + public static final FaweException NO_REGION = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.no.region")); + public static final FaweException OUTSIDE_REGION = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.outside.region")); + public static final FaweException MAX_CHECKS = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.max.checks")); + public static final FaweException MAX_CHANGES = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.max.changes")); + public static final FaweException LOW_MEMORY = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.low.memory")); + public static final FaweException MAX_ENTITIES = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.max.entities")); + public static final FaweException MAX_TILES = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.max.tiles")); + public static final FaweException MAX_ITERATIONS = new FaweException(TranslatableComponent.of("fawe.cancel.worldedit.cancel.reason.max.iterations")); /* thread cache diff --git a/worldedit-core/src/main/java/com/boydti/fawe/command/AnvilCommands.java b/worldedit-core/src/main/java/com/boydti/fawe/command/AnvilCommands.java index 950237b4f..295ff09be 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/command/AnvilCommands.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/command/AnvilCommands.java @@ -52,7 +52,7 @@ public class AnvilCommands { // boolean copy = false; // if (FaweAPI.getWorld(folder) != null) { // if (!force) { -// BBC.WORLD_IS_LOADED.send(player); +// player.print(TranslatableComponent.of("fawe.worldedit.anvil.world.is.loaded")) // return null; // } // copy = true; @@ -80,7 +80,7 @@ public class AnvilCommands { // @Deprecated // public static > T runWithSelection(Player player, EditSession editSession, Region selection, T filter) { // if (!(selection instanceof CuboidRegion)) { -// BBC.NO_REGION.send(player); +// player.print(TranslatableComponent.of("fawe.error.no.region")) // return null; // } // CuboidRegion cuboid = (CuboidRegion) selection; @@ -131,7 +131,7 @@ public class AnvilCommands { // final FaweBlockMatcher matchTo = FaweBlockMatcher.setBlocks(worldEdit.getBlocks(player, to, true)); // ReplaceSimpleFilter filter = new ReplaceSimpleFilter(matchFrom, matchTo); // ReplaceSimpleFilter result = runWithWorld(player, folder, filter, true); -// if (result != null) player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// if (result != null) player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); } @Command( @@ -148,7 +148,7 @@ public class AnvilCommands { // RemapFilter filter = new RemapFilter(from, to); // RemapFilter result = runWithWorld(player, folder, filter, true); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -167,7 +167,7 @@ public class AnvilCommands { // DeleteUninhabitedFilter filter = new DeleteUninhabitedFilter(fileDurationMillis, inhabitedTicks, fileDurationMillis); TODO NOT IMPLEMENTED // DeleteUninhabitedFilter result = runWithWorld(player, folder, filter, true); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -190,7 +190,7 @@ public class AnvilCommands { // } // DeleteUnclaimedFilter result = runWithWorld(player, folder, filter, true); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -212,7 +212,7 @@ public class AnvilCommands { // } // DeleteUnclaimedFilter result = runWithSelection(player, editSession, selection, filter); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -229,7 +229,7 @@ public class AnvilCommands { // DeleteOldFilter filter = new DeleteOldFilter(duration); // DeleteOldFilter result = runWithWorld(player, folder, filter, true); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -249,7 +249,7 @@ public class AnvilCommands { // MCAQueue queue = new MCAQueue(defaultQueue); // PlotTrimFilter result = queue.filterWorld(filter); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -262,7 +262,7 @@ public class AnvilCommands { // DeleteBiomeFilterSimple filter = new DeleteBiomeFilterSimple(biome); TODO NOT IMPLEMENTED // DeleteBiomeFilterSimple result = runWithWorld(player, folder, filter, true, unsafe); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -275,7 +275,7 @@ public class AnvilCommands { // TrimAirFilter filter = new TrimAirFilter(); TODO NOT IMPLEMENTED // TrimAirFilter result = runWithWorld(player, folder, filter, true, unsafe); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -289,7 +289,7 @@ public class AnvilCommands { // DebugFixP2Roads filter = new DebugFixP2Roads(); TODO NOT IMPLEMENTED // DebugFixP2Roads result = runWithWorld(player, folder, filter, true, true); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -319,7 +319,7 @@ public class AnvilCommands { // filter = new ReplacePatternFilter(matchFrom, to); // } // MCAFilterCounter result = runWithWorld(player, folder, filter, true); -// if (result != null) player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// if (result != null) player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); } // @@ -341,7 +341,7 @@ public class AnvilCommands { // filter = counter; // } // MCAFilterCounter result = runWithWorld(player, folder, filter, true); -// if (result != null) player.print(BBC.SELECTION_COUNT.format(result.getTotal())); +// if (result != null) player.print(TranslatableComponent.of("fawe.worldedit.selection.selection.count", (result.getTotal()))); } @Command( @@ -393,7 +393,7 @@ public class AnvilCommands { // }; // MCAFilterCounter result = runWithSelection(player, editSession, selection, filter); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -415,7 +415,7 @@ public class AnvilCommands { // filter = counter; // } // MCAFilterCounter result = runWithSelection(player, editSession, selection, filter); -// if (result != null) player.print(BBC.SELECTION_COUNT.format(result.getTotal())); +// if (result != null) player.print(TranslatableComponent.of("fawe.worldedit.selection.selection.count", (result.getTotal()))); } // @@ -514,7 +514,7 @@ public class AnvilCommands { // ReplaceSimpleFilter filter = new ReplaceSimpleFilter(matchFrom, matchTo); // MCAFilterCounter result = runWithSelection(player, editSession, selection, filter); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -546,7 +546,7 @@ public class AnvilCommands { // } // MCAFilterCounter result = runWithSelection(player, editSession, selection, filter); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -560,7 +560,7 @@ public class AnvilCommands { // MCAFilterCounter filter = new SetPatternFilter(to); TODO NOT IMPLEMENTED // MCAFilterCounter result = runWithSelection(player, editSession, selection, filter); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -578,7 +578,7 @@ public class AnvilCommands { // RemoveLayerFilter filter = new RemoveLayerFilter(minY, maxY, id); // MCAFilterCounter result = runWithSelection(player, editSession, selection, filter); // if (result != null) { -// player.print(BBC.VISITOR_BLOCK.format(result.getTotal())); +// player.print(TranslatableComponent.of("fawe.worldedit.visitor.visitor.block", (result.getTotal()))); // } } @@ -590,7 +590,7 @@ public class AnvilCommands { @CommandPermissions("worldedit.anvil.copychunks") public void copy(Player player, LocalSession session, EditSession editSession, @Selection Region selection) throws WorldEditException { // if (!(selection instanceof CuboidRegion)) { TODO NOT IMPLEMENTED -// BBC.NO_REGION.send(player); +// player.print(TranslatableComponent.of("fawe.error.no.region")) // return; // } // CuboidRegion cuboid = (CuboidRegion) selection; @@ -601,7 +601,7 @@ public class AnvilCommands { // MCAClipboard clipboard = new MCAClipboard(queue, cuboid, origin); // FawePlayer fp = FawePlayer.wrap(player); // fp.setMeta(FawePlayer.METADATA_KEYS.ANVIL_CLIPBOARD, clipboard); -// BBC.COMMAND_COPY.send(player, selection.getArea()); +// player.print(TranslatableComponent.of("fawe.worldedit.copy.command.copy" , selection.getArea())); } @Command( @@ -638,6 +638,6 @@ public class AnvilCommands { // pasteQueue.pasteRegion(copyQueue, copyRegion, offset, iAnvilHistory); // } catch (IOException e) { throw new RuntimeException(e); } // }); -// BBC.COMMAND_PASTE.send(player, player.getPosition().toBlockVector()); +// player.print(TranslatableComponent.of("fawe.worldedit.paste.command.paste" , player.getPosition().toBlockVector())); } } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java b/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java index 6ec3e86e2..0cec178df 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java @@ -8,6 +8,7 @@ import com.boydti.fawe.Fawe; import com.boydti.fawe.FaweAPI; import com.boydti.fawe.beta.implementation.filter.block.SingleFilterBlock; import com.boydti.fawe.config.BBC; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.boydti.fawe.object.RunnableVal; import com.boydti.fawe.object.brush.visualization.cfi.HeightMapMCAGenerator; import com.boydti.fawe.object.clipboard.MultiClipboardHolder; @@ -949,7 +950,7 @@ public class CFICommands { JsonObject data1 = obj.get("data").getAsJsonObject(); String link = data1.get("link").getAsString(); URL url = new URL(link); - BBC.DOWNLOAD_LINK.send(player, url); + player.print(TranslatableComponent.of("fawe.web.download.link" , url)); } @Command( diff --git a/worldedit-core/src/main/java/com/boydti/fawe/command/Rollback.java b/worldedit-core/src/main/java/com/boydti/fawe/command/Rollback.java index 9beca2402..2ed1d0f54 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/command/Rollback.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/command/Rollback.java @@ -3,6 +3,7 @@ package com.boydti.fawe.command; import com.boydti.fawe.Fawe; import com.boydti.fawe.FaweAPI; import com.boydti.fawe.config.BBC; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.FaweCommand; import com.boydti.fawe.object.RegionWrapper; @@ -34,11 +35,11 @@ public class Rollback extends FaweCommand { } Player player = (Player) actor; if (!Settings.IMP.HISTORY.USE_DATABASE) { - BBC.SETTING_DISABLE.send(player, "history.use-database (Import with /frb #import )"); + player.print(TranslatableComponent.of("fawe.error.setting.disable" , "history.use-database (Import with /frb #import )")); return false; } if (args.length != 3) { - BBC.COMMAND_SYNTAX.send(player, "/frb u: r: t: