Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline

Conflicts: worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java worldedit-core/src/main/java/com/boydti/fawe/beta/filters/DistrFilter.java worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ChunkCache.java worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ParallelQueueExtent.java worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
2025-07-13 14:48:34 +00:00 · 2019-11-02 15:58:46 -04:00
parent f262271519 e20e48f5fb
commit d8d7c8c53f
220 changed files with 8294 additions and 5283 deletions
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
@ -19,10 +19,6 @@

 package com.sk89q.worldedit.command;

-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT;
-import static com.sk89q.worldedit.command.util.Logging.LogMode.REGION;
-
 import com.boydti.fawe.FaweAPI;
 import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.config.BBC;
@ -35,7 +31,6 @@ import com.boydti.fawe.object.clipboard.URIClipboardHolder;
 import com.boydti.fawe.object.clipboard.WorldCutClipboard;
 import com.boydti.fawe.object.exception.FaweException;
 import com.boydti.fawe.object.io.FastByteArrayOutputStream;
-import com.boydti.fawe.object.schematic.Schematic;
 import com.boydti.fawe.util.ImgurUtility;
 import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.MaskTraverser;
@ -75,6 +70,13 @@ import com.sk89q.worldedit.regions.RegionSelector;
 import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
+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 org.enginehub.piston.inject.InjectedValueAccess;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@ -86,12 +88,10 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-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 org.enginehub.piston.inject.InjectedValueAccess;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT;
+import static com.sk89q.worldedit.command.util.Logging.LogMode.REGION;


 /**
@ -516,8 +516,7 @@ public class ClipboardCommands {
        final BlockVector3 to = atOrigin ? origin : session.getPlacementPosition(actor);
        checkPaste(actor, editSession, to, holder, clipboard);

-        Schematic schem = new Schematic(clipboard);
-        schem.paste(editSession, to, !ignoreAirBlocks);
+        clipboard.paste(editSession, to, !ignoreAirBlocks);

        Region region = clipboard.getRegion().clone();
        if (selectPasted) {
@ -538,6 +537,7 @@ public class ClipboardCommands {

    @Command(
        name = "/rotate",
+        aliases = {"/rt"},
        desc = "Rotate the contents of the clipboard",
        descFooter = "Non-destructively rotate the contents of the clipboard.\n" +
            "Angles are provided in degrees and a positive angle will result in a clockwise rotation. " +
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java
@ -219,8 +219,8 @@ public class HistoryCommands {
    }

    @Command(
-        name = "undo",
-        aliases = { "/undo" },
+        name = "/undo",
+        aliases = { "/un", "/ud", "undo" },
        desc = "Undoes the last action (from history)"
    )
    @CommandPermissions({"worldedit.history.undo", "worldedit.history.undo.self"})
@ -266,8 +266,8 @@ public class HistoryCommands {
    }

    @Command(
-        name = "redo",
-        aliases = { "/redo" },
+        name = "/redo",
+        aliases = { "/do", "/rd", "redo" },
        desc = "Redoes the last action (from history)"
    )
    @CommandPermissions({"worldedit.history.redo", "worldedit.history.redo.self"})
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java
@ -31,6 +31,8 @@ import static com.sk89q.worldedit.regions.Regions.minimumBlockY;

 import com.boydti.fawe.FaweAPI;
 import com.boydti.fawe.FaweCache;
+import com.boydti.fawe.beta.implementation.processors.ChunkSendProcessor;
+import com.boydti.fawe.beta.implementation.processors.NullProcessor;
 import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.object.FaweLimit;
 import com.sk89q.jnbt.CompoundTag;
@ -76,6 +78,9 @@ import com.sk89q.worldedit.world.block.BlockStateHolder;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Stream;
+
+import com.sk89q.worldedit.world.block.BlockTypes;
 import org.enginehub.piston.annotation.Command;
 import org.enginehub.piston.annotation.CommandContainer;
 import org.enginehub.piston.annotation.param.Arg;
@ -102,15 +107,29 @@ public class RegionCommands {
    }

    @Command(
-        name = "/set",
-        desc = "Sets all the blocks in the region"
+            name = "/air",
+            aliases = {"/0"},
+            desc = "Sets all the blocks in the region to air"
+    )
+    @CommandPermissions("worldedit.region.set")
+    @Logging(REGION)
+    public void air(Actor actor, EditSession editSession,
+                    @Selection Region region,
+                    InjectedValueAccess context) throws WorldEditException {
+        set(actor, editSession, region, BlockTypes.AIR, context);
+    }
+
+    @Command(
+            name = "/set",
+            aliases = {"/"},
+            desc = "Sets all the blocks in the region"
    )
    @CommandPermissions("worldedit.region.set")
    @Logging(REGION)
    public void set(Actor actor, EditSession editSession,
-        @Selection Region region,
-        @Arg(desc = "The pattern of blocks to set")
-            Pattern pattern, InjectedValueAccess context) throws WorldEditException {
+                    @Selection Region region,
+                    @Arg(desc = "The pattern of blocks to set")
+                            Pattern pattern, InjectedValueAccess context) throws WorldEditException {
        actor.checkConfirmationRegion(() -> {
            int affected = editSession.setBlocks(region, pattern);
            if (affected != 0) {
@ -121,6 +140,21 @@ public class RegionCommands {
        }, getArguments(context), region, context);
    }

+    @Command(
+            name = "/test",
+            desc = "test region"
+    )
+    @CommandPermissions("worldedit.region.test")
+    @Logging(REGION)
+    public void test(World world, Player player, EditSession editSession,
+                    @Selection Region region,
+                    @Arg(desc = "The pattern of blocks to set")
+                            Pattern pattern, InjectedValueAccess context) throws WorldEditException {
+        editSession.addProcessor(new ChunkSendProcessor(world, () -> Stream.of(player)));
+        editSession.addProcessor(NullProcessor.INSTANCE);
+        editSession.setBlocks(region, pattern);
+    }
+
    @Command(
            name = "/fixlighting",
            desc = "Get the light at a position"
@ -267,7 +301,7 @@ public class RegionCommands {

    @Command(
        name = "/replace",
-        aliases = { "/re", "/rep", "/r" },
+        aliases = { "/repl", "/rep" },
        desc = "Replace all blocks in the selection with another"
    )
    @CommandPermissions("worldedit.region.replace")
@ -459,6 +493,7 @@ public class RegionCommands {

    @Command(
            name = "/move",
+            aliases = {"/mv"},
            desc = "Move the contents of the selection"
    )
    @CommandPermissions("worldedit.region.move")
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
@ -584,7 +584,7 @@ public class SchematicCommands {
                         boolean oldFirst,
                     @Switch(name = 'n', desc = "Sort by date, newest first")
                         boolean newFirst,
-                     @ArgFlag(name = 'f', desc = "Restricts by format.")
+                     @ArgFlag(name = 'f', desc = "Restricts by format.", def = "")
                         String formatName,
                     @Arg(name = "filter", desc = "Filter for schematics", def = "all")
                         String filter,
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
@ -194,8 +194,8 @@ public class ToolUtilCommands {
    }

    @Command(
-            name = "/",
-            aliases = {","},
+            name = "/superpickaxe",
+            aliases = {",", "/sp", "/pickaxe"},
            desc = "Toggle the super pickaxe function"
    )
    @CommandPermissions("worldedit.superpickaxe")
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
@ -110,6 +110,15 @@ public class UtilityCommands {
        this.we = we;
    }

+    @Command(
+            name = "/macro",
+            desc = "Generate or run a macro"
+    )
+    @CommandPermissions("worldedit.macro")
+    public void macro(Player player, LocalSession session, String name, String argument) throws IOException {
+
+    }
+
    @Command(
            name = "/heightmapinterface",
            desc = "Generate the heightmap interface: https://github.com/boy0001/HeightMap"
@ -420,7 +429,7 @@ public class UtilityCommands {

    @Command(
        name = "replacenear",
-        aliases = { "/replacenear" },
+        aliases = { "/replacenear", "/rn" },
        desc = "Replace nearby blocks"
    )
    @CommandPermissions("worldedit.replacenear")
--- 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
@ -74,7 +74,8 @@ public class DistanceWand extends BrushTool implements DoubleActionTraceTool {
    private Location getTarget(Player player) {
        Location target;
        Mask mask = getTraceMask();
-        if (this.range < MAX_RANGE) {
+        int range = getRange();
+        if (range < MAX_RANGE) {
            target = player.getBlockTrace(getRange(), true, mask);
        } else {
            target = player.getBlockTrace(MAX_RANGE, false, mask);