Continue the adventure

Author: octylFractal

buildSrc/src/main/kotlin/PlatformConfig.kt

@@ -1,5 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import net.minecrell.gradle.licenser.LicenseExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginConvention

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java

@@ -29,6 +29,8 @@
 
 import javax.annotation.Nullable;
 
+import static com.sk89q.worldedit.util.formatting.text.Component.translatable;
+
 /**
  * A biome registry for Bukkit.
  */
@@ -39,7 +41,7 @@ class BukkitBiomeRegistry implements BiomeRegistry {
 
     @Override
     public Component getRichName(BiomeType biomeType) {
-        return TranslatableComponent.of(
+        return translatable(
             TranslationManager.makeTranslationKey("biome", biomeType.getId())
         );
     }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java

@@ -32,8 +32,6 @@
 import com.sk89q.worldedit.session.SessionKey;
 import com.sk89q.worldedit.util.HandSide;
 import com.sk89q.worldedit.util.formatting.component.TextUtils;
-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.NamedTextColor;
 import com.sk89q.worldedit.world.World;
@@ -42,6 +40,7 @@
 import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.gamemode.GameMode;
 import com.sk89q.worldedit.world.gamemode.GameModes;
+import net.kyori.adventure.audience.Audience;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -51,8 +50,13 @@
 import java.util.UUID;
 import javax.annotation.Nullable;
 
+import static com.sk89q.worldedit.util.formatting.text.Component.text;
+import static com.sk89q.worldedit.util.formatting.text.Component.translatable;
+import static com.sk89q.worldedit.util.formatting.text.event.ClickEvent.openUrl;
+
 public class BukkitPlayer extends AbstractPlayerActor {
 
+    private final Audience audience;
     private final Player player;
     private final WorldEditPlugin plugin;
 
@@ -62,6 +66,7 @@ public BukkitPlayer(Player player) {
 
     public BukkitPlayer(WorldEditPlugin plugin, Player player) {
         super(plugin.getAudiences().player(player)::sendMessage);
+        this.audience = plugin.getAudiences().player(player);
         this.plugin = plugin;
         this.player = player;
     }
@@ -193,9 +198,12 @@ public Locale getLocale() {
     @Override
     public void sendAnnouncements() {
         if (WorldEditPlugin.getInstance().getBukkitImplAdapter() == null) {
-            printError(TranslatableComponent.of("worldedit.version.bukkit.unsupported-adapter",
-                    TextComponent.of("https://enginehub.org/worldedit/#downloads", NamedTextColor.AQUA)
-                        .clickEvent(ClickEvent.openUrl("https://enginehub.org/worldedit/#downloads"))));
+            printError(translatable(
+                "worldedit.version.bukkit.unsupported-adapter",
+                text()
+                    .content("https://enginehub.org/worldedit/#downloads")
+                    .color(NamedTextColor.AQUA)
+                    .clickEvent(openUrl("https://enginehub.org/worldedit/#downloads"))));
         }
     }
 

worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java

@@ -32,7 +32,6 @@
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
 import com.sk89q.worldedit.registry.state.Property;
-import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BlockCategory;
 import com.sk89q.worldedit.world.block.BlockState;
@@ -62,6 +61,8 @@
 import java.util.Map;
 import java.util.Scanner;
 
+import static com.sk89q.worldedit.util.formatting.text.Component.translatable;
+
 /**
  * The CLI implementation of WorldEdit.
  */
@@ -238,13 +239,13 @@ public void run(InputStream inputStream) {
             while (scanner.hasNextLine()) {
                 String line = scanner.nextLine();
                 if (line.equals("stop")) {
-                    commandSender.printInfo(TranslatableComponent.of("worldedit.cli.stopping"));
+                    commandSender.printInfo(translatable("worldedit.cli.stopping"));
                     break;
                 }
                 CommandEvent event = new CommandEvent(commandSender, line);
                 WorldEdit.getInstance().getEventBus().post(event);
                 if (!event.isCancelled()) {
-                    commandSender.printError(TranslatableComponent.of("worldedit.cli.unknown-command"));
+                    commandSender.printError(translatable("worldedit.cli.unknown-command"));
                 } else {
                     saveAllWorlds(false);
                 }

worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java

@@ -19,14 +19,13 @@
 
 package com.sk89q.minecraft.util.commands;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
-
 import javax.annotation.Nullable;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class CommandException extends Exception {
 
     private final List<String> commandStack = new ArrayList<>();

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

@@ -111,8 +111,6 @@
 import com.sk89q.worldedit.util.collection.BlockMap;
 import com.sk89q.worldedit.util.collection.DoubleArrayList;
 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.world.NullWorld;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.biome.BiomeType;
@@ -142,6 +140,8 @@
 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.formatting.text.Component.text;
+import static com.sk89q.worldedit.util.formatting.text.Component.translatable;
 
 /**
  * An {@link Extent} that handles history, {@link BlockBag}s, change limits,
@@ -888,7 +888,7 @@ private void dumpTracingInformation() {
         List<TracingExtent> tracingExtents = getActiveTracingExtents();
         assert actor != null;
         if (tracingExtents.isEmpty()) {
-            actor.printError(TranslatableComponent.of("worldedit.trace.no-tracing-extents"));
+            actor.printError(translatable("worldedit.trace.no-tracing-extents"));
             return;
         }
         // find the common stacks
@@ -911,13 +911,12 @@ private void dumpTracingInformation() {
         stackToPosition.forEach((stack, position) -> {
             // stack can never be empty, something has to have touched the position
             TracingExtent failure = stack.get(0);
-            actor.printDebug(TranslatableComponent.builder("worldedit.trace.action-failed")
-                .args(
-                    TextComponent.of(failure.getFailedActions().get(position).toString()),
-                    TextComponent.of(position.toString()),
-                    TextComponent.of(failure.getExtent().getClass().getName())
-                )
-                .build());
+            actor.printDebug(translatable(
+                "worldedit.trace.action-failed",
+                text(failure.getFailedActions().get(position).toString()),
+                text(position.toString()),
+                text(failure.getExtent().getClass().getName())
+            ));
         });
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionFactory.java

@@ -24,8 +24,6 @@
 import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.world.World;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Creates new {@link EditSession}s. To get an instance of this factory,
  * use {@link WorldEdit#getEditSessionFactory()}.

worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java

@@ -50,7 +50,6 @@
 import com.sk89q.worldedit.session.request.Request;
 import com.sk89q.worldedit.util.Countable;
 import com.sk89q.worldedit.util.SideEffectSet;
-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;
@@ -71,6 +70,7 @@
 import javax.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.worldedit.util.formatting.text.Component.translatable;
 
 /**
  * Stores session information.
@@ -674,7 +674,7 @@ public BrushTool getBrushTool(ItemType item) throws InvalidToolBindException {
      */
     public void setTool(ItemType item, @Nullable Tool tool) throws InvalidToolBindException {
         if (item.hasBlockType()) {
-            throw new InvalidToolBindException(item, TranslatableComponent.of("worldedit.tool.error.item-only"));
+            throw new InvalidToolBindException(item, translatable("worldedit.tool.error.item-only"));
         }
         if (tool instanceof SelectionWand) {
             setSingleItemTool(id -> this.wandItem = id, this.wandItem, item);

worldedit-core/src/main/java/com/sk89q/worldedit/MissingWorldException.java

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit;
 
-import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
+import static com.sk89q.worldedit.util.formatting.text.Component.translatable;
 
 /**
  * Raised when a world is missing but is required.
  */
 public class MissingWorldException extends WorldEditException {
 
     public MissingWorldException() {
-        super(TranslatableComponent.of("worldedit.error.missing-world"));
+        super(translatable("worldedit.error.missing-world"));
     }
 }

worldedit-core/src/main/java/com/sk89q/worldedit/NotABlockException.java

@@ -19,10 +19,11 @@
 
 package com.sk89q.worldedit;
 
-import com.sk89q.worldedit.util.formatting.text.TextComponent;
-import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import com.sk89q.worldedit.world.item.ItemType;
 
+import static com.sk89q.worldedit.util.formatting.text.Component.text;
+import static com.sk89q.worldedit.util.formatting.text.Component.translatable;
+
 /**
  * Raised when an item is used when a block was expected.
  */
@@ -32,7 +33,7 @@ public class NotABlockException extends WorldEditException {
      * Create a new instance.
      */
     public NotABlockException() {
-        super(TranslatableComponent.of("worldedit.error.not-a-block"));
+        super(translatable("worldedit.error.not-a-block"));
     }
 
     /**
@@ -42,7 +43,7 @@ public NotABlockException() {
      */
     @Deprecated
     public NotABlockException(String input) {
-        super(TranslatableComponent.of("worldedit.error.not-a-block.item", TextComponent.of(input)));
+        super(translatable("worldedit.error.not-a-block.item", text(input)));
     }
 
     /**
@@ -52,7 +53,7 @@ public NotABlockException(String input) {
      */
     @Deprecated
     public NotABlockException(int input) {
-        super(TranslatableComponent.of("worldedit.error.not-a-block.item", TextComponent.of(input)));
+        super(translatable("worldedit.error.not-a-block.item", text(input)));
     }
 
     /**
@@ -61,6 +62,6 @@ public NotABlockException(int input) {
      * @param input the input that was used
      */
     public NotABlockException(ItemType input) {
-        super(TranslatableComponent.of("worldedit.error.not-a-block.item", input.getRichName()));
+        super(translatable("worldedit.error.not-a-block.item", input.getRichName()));
     }
 }