Deleted a class and work on generation commands

worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java

@@ -88,7 +88,6 @@ public class GenerationCommands {
 
     @Command(
             name = "/caves",
-            usage = "[size=8] [freq=40] [rarity=7] [minY=8] [maxY=127] [sysFreq=1] [sysRarity=25] [pocketRarity=0] [pocketMin=0] [pocketMax=3]",
             desc = "Generates a cave network"
     )
     @CommandPermissions("worldedit.generation.caves")
@@ -126,9 +125,8 @@ public class GenerationCommands {
     }
 
     @Command(
-            aliases = {"/image", "/img"},
+            name = "/img",
-            desc = "Generate an image",
+            desc = "Generate an image"
-            usage = "<imgur> [randomize=true] [complexity=100] [dimensions=100,100]"
     )
     @CommandPermissions("worldedit.generation.image")
     @Logging(PLACEMENT)
@@ -169,7 +167,6 @@ public class GenerationCommands {
 
     @Command(
             name = "/ore",
-            usage = "<mask> <pattern> <size> <freq> <rarity> <minY> <maxY>",
             desc = "Generates ores"
     )
     @CommandPermissions("worldedit.generation.ore")
@@ -183,13 +180,7 @@ public class GenerationCommands {
 
     @Command(
         name = "/hcyl",
-        usage = "<pattern> <radius>[,<radius>] [height]",
+        desc = "Generates a hollow cylinder."
-        desc = "Generates a hollow cylinder.",
-        help =
-            "Generates a hollow cylinder.\n" +
-            "By specifying 2 radii, separated by a comma,\n" +
-            "you can generate elliptical cylinders.\n" +
-            "The 1st radius is north/south, the 2nd radius is east/west."
     )
     @CommandPermissions("worldedit.generation.cylinder")
     @Logging(PLACEMENT)
@@ -211,12 +202,7 @@ public class GenerationCommands {
 
     @Command(
         name = "/cyl",
-        desc = "Generates a cylinder.",
+        desc = "Generates a cylinder."
-        help =
-            "Generates a cylinder.\n" +
-            "By specifying 2 radii, separated by a comma,\n" +
-            "you can generate elliptical cylinders.\n" +
-            "The 1st radius is north/south, the 2nd radius is east/west."
     )
     @CommandPermissions("worldedit.generation.cylinder")
     @Logging(PLACEMENT)
@@ -239,13 +225,7 @@ public class GenerationCommands {
 
     @Command(
         name = "/hsphere",
-        usage = "<pattern> <radius>[,<radius>,<radius>] [raised?]",
+        desc = "Generates a hollow sphere."
-        desc = "Generates a hollow sphere.",
-        help =
-            "Generates a hollow sphere.\n" +
-            "By specifying 3 radii, separated by commas,\n" +
-            "you can generate an ellipsoid. The order of the ellipsoid radii\n" +
-            "is north/south, up/down, east/west."
     )
     @CommandPermissions("worldedit.generation.sphere")
     @Logging(PLACEMENT)
@@ -263,12 +243,7 @@ public class GenerationCommands {
 
     @Command(
         name = "/sphere",
-        desc = "Generates a filled sphere.",
+        desc = "Generates a filled sphere."
-        help =
-            "Generates a filled sphere.\n" +
-            "By specifying 3 radii, separated by commas,\n" +
-            "you can generate an ellipsoid. The order of the ellipsoid radii\n" +
-            "is north/south, up/down, east/west."
     )
     @CommandPermissions("worldedit.generation.sphere")
     @Logging(PLACEMENT)
@@ -345,11 +320,11 @@ public class GenerationCommands {
     @Logging(POSITION)
     public int pumpkins(Player player, LocalSession session, EditSession editSession,
                         @Arg(desc = "The size of the patch", def = "10")
-                                int size,
+                            int size,
-                         @Arg(desc = "//TODO", def = "10")
+                        @Arg(desc = "//TODO", def = "10")
-                                     int apothem,
+                            int apothem,
-                         @Arg(desc = "//TODO ", def = "0.02")
+                        @Arg(desc = "//TODO ", def = "0.02")
-                                     double density) throws WorldEditException {
+                            double density) throws WorldEditException {
         int affected = editSession.makePumpkinPatches(session.getPlacementPosition(player), apothem, density);
         BBC.COMMAND_PUMPKIN.send(player, affected);
         return affected;
@@ -362,10 +337,10 @@ public class GenerationCommands {
     @CommandPermissions("worldedit.generation.pyramid")
     @Logging(PLACEMENT)
     public void hollowPyramid(FawePlayer fp, Player player, LocalSession session, EditSession editSession,
-        @Arg(desc = "The pattern of blocks to set")
+                             @Arg(desc = "The pattern of blocks to set")
-            Pattern pattern,
+                                 Pattern pattern,
-        @Arg(desc = "The size of the pyramid")
+                             @Arg(desc = "The size of the pyramid")
-            int size, CommandContext context) throws WorldEditException {
+                                 int size, CommandContext context) throws WorldEditException {
         pyramid(fp, player, session, editSession, pattern, size, true, context);
     }
 
@@ -376,12 +351,12 @@ public class GenerationCommands {
     @CommandPermissions("worldedit.generation.pyramid")
     @Logging(PLACEMENT)
     public void pyramid(FawePlayer fp, Player player, LocalSession session, EditSession editSession,
-                        @Arg(desc = "The pattern of blocks to set")
+                       @Arg(desc = "The pattern of blocks to set")
-                            Pattern pattern,
+                           Pattern pattern,
-                        @Arg(desc = "The size of the pyramid")
+                       @Arg(desc = "The size of the pyramid")
-                                    int size,
+                           int size,
-                        @Switch(name = 'h', desc = "Make a hollow pyramid")
+                       @Switch(name = 'h', desc = "Make a hollow pyramid")
-                                    boolean hollow,
+                           boolean hollow,
                         CommandContext context) throws WorldEditException {
         BlockVector3 pos = session.getPlacementPosition(player);
         worldEdit.checkMaxRadius(size);
@@ -396,7 +371,7 @@ public class GenerationCommands {
         name = "/generate",
         aliases = { "/gen", "/g" },
         desc = "Generates a shape according to a formula.",
-        descFooter = "See also https://tinyurl.com/wesyntax."
+        descFooter = "See also https://tinyurl.com/weexpr."
     )
     @CommandPermissions("worldedit.generation.shape")
     @Logging(ALL)
@@ -462,11 +437,11 @@ public class GenerationCommands {
         name = "/generatebiome",
         aliases = { "/genbiome", "/gb" },
         desc = "Sets biome according to a formula.",
-        descFooter = "See also https://tinyurl.com/wesyntax."
+        descFooter = "See also https://tinyurl.com/weexpr."
     )
     @CommandPermissions("worldedit.generation.shape.biome")
     @Logging(ALL)
-    public int generateBiome(Player player, LocalSession session, EditSession editSession,
+    public int generateBiome(FawePlayer fp, LocalSession session, EditSession editSession,
                              @Selection Region region,
                              @Arg(desc = "The biome type to set")
                                  BiomeType target,
@@ -487,7 +462,7 @@ public class GenerationCommands {
             zero = Vector3.ZERO;
             unit = Vector3.ONE;
         } else if (offset) {
-            zero = session.getPlacementPosition(player).toVector3();
+            zero = session.getPlacementPosition(fp.toWorldEditPlayer()).toVector3();
             unit = Vector3.ONE;
         } else if (offsetCenter) {
             final Vector3 min = region.getMinimumPoint().toVector3();
@@ -508,10 +483,9 @@ public class GenerationCommands {
         }
 
         final Vector3 unit1 = unit;
-
         fp.checkConfirmationRegion(() -> {
             try {
-                final int affected = editSession.makeBiomeShape(region, zero, unit1, target, expression, hollow);
+                final int affected = editSession.makeBiomeShape(region, zero, unit1, target, String.join(" ", expression), hollow, session.getTimeout());
                 player.findFreePosition();
                 BBC.VISITOR_FLAT.send(fp, affected);
             } catch (ExpressionException e) {

worldedit-core/src/main/java/com/sk89q/worldedit/command/HelpBuilder.java

@@ -1,230 +0,0 @@
-package com.sk89q.worldedit.command;
-
-import com.boydti.fawe.config.BBC;
-import com.boydti.fawe.util.StringMan;
-
-import com.google.common.base.Joiner;
-import org.enginehub.piston.annotation.Command;
-import com.sk89q.minecraft.util.commands.CommandContext;
-import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
-import com.sk89q.worldedit.util.command.CommandCallable;
-import com.sk89q.worldedit.util.command.CommandMapping;
-import com.sk89q.worldedit.util.command.DelegateCallable;
-import com.sk89q.worldedit.util.command.Dispatcher;
-import com.sk89q.worldedit.util.command.PrimaryAliasComparator;
-import com.sk89q.worldedit.util.command.parametric.AParametricCallable;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-public abstract class HelpBuilder implements Runnable {
-    private final CommandCallable callable;
-    private final CommandContext args;
-    private final int perPage;
-
-    HelpBuilder(@NotNull CommandCallable callable, CommandContext args, int perPage) {
-        this.callable = callable;
-        this.args = args;
-        this.perPage = perPage;
-    }
-
-    @Override
-    public void run() {
-        try {
-            CommandCallable callable = this.callable;
-            int page = -1;
-            int effectiveLength = args.argsLength();
-
-            // Detect page from args
-            try {
-                if (effectiveLength > 0) {
-                    page = args.getInteger(args.argsLength() - 1);
-                    if (page <= 0) {
-                        page = 1;
-                    } else {
-                        page--;
-                    }
-                    effectiveLength--;
-                }
-            } catch (Exception ignored) {
-            }
-
-            List<String> visited = new ArrayList<>();
-
-            // Create the message
-            if (callable instanceof Dispatcher) {
-                Dispatcher dispatcher = (Dispatcher) callable;
-
-                // Get a list of aliases
-                List<CommandMapping> aliases = new ArrayList<>(dispatcher.getCommands());
-                List<String> prefixes = Collections.nCopies(aliases.size(), "");
-                // Group by callable
-
-                if (page == -1 || effectiveLength > 0) {
-                    Map<String, Map<CommandMapping, String>> grouped = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-                    for (CommandMapping mapping : aliases) {
-                        CommandCallable c = mapping.getCallable();
-                        if (c instanceof DelegateCallable) {
-                            c = ((DelegateCallable) c).getParent();
-                        }
-                        String group;
-                        if (c instanceof AParametricCallable) {
-                            Command command = ((AParametricCallable) c).getCommand();
-                            if (command != null && command.aliases().length != 0) {
-                                group = command.aliases()[0];
-                            } else {
-                                group = ((AParametricCallable) c).getGroup();
-                            }
-                        } else if (c instanceof Dispatcher) {
-                            group = mapping.getPrimaryAlias();
-                        } else {
-                            group = "Unsorted";
-                        }
-                        group = group.replace("/", "");
-                        group = StringMan.toProperCase(group);
-                        Map<CommandMapping, String> queue = grouped.computeIfAbsent(group, k -> new LinkedHashMap<>());
-                        if (c instanceof Dispatcher) {
-                            for (CommandMapping m : ((Dispatcher) c).getCommands()) {
-                                queue.put(m, mapping.getPrimaryAlias() + " ");
-                            }
-                        } else {
-                            // Sub commands get priority
-                            queue.putIfAbsent(mapping, "");
-                        }
-                    }
-                    if (effectiveLength > 0) {
-                        String cat = args.getString(0);
-                        Map<CommandMapping, String> mappings = effectiveLength == 1 ? grouped.get(cat) : null;
-                        if (mappings == null) {
-                            // Drill down to the command
-                            boolean isRootLevel = true;
-                            for (int i = 0; i < effectiveLength; i++) {
-                                String command = args.getString(i);
-
-                                if (callable instanceof Dispatcher) {
-                                    // Chop off the beginning / if we're are the root level
-                                    if (isRootLevel && command.length() > 1 && command.charAt(0) == '/') {
-                                        command = command.substring(1);
-                                    }
-
-                                    CommandMapping mapping = UtilityCommands.detectCommand((Dispatcher) callable, command, isRootLevel);
-                                    if (mapping != null) {
-                                        callable = mapping.getCallable();
-                                    } else {
-                                        if (isRootLevel) {
-                                            Set<String> found = new HashSet<>();
-                                            String arg = args.getString(i).toLowerCase();
-                                            String closest = null;
-                                            int distance = Integer.MAX_VALUE;
-                                            for (CommandMapping map : aliases) {
-                                                String desc = map.getDescription().getDescription();
-                                                if (desc == null) desc = map.getDescription().getHelp();
-                                                if (desc == null) desc = "";
-                                                String[] descSplit = desc.replaceAll("[^A-Za-z0-9]", "").toLowerCase().split(" ");
-                                                for (String alias : map.getAllAliases()) {
-                                                    if (alias.equals(arg)) {
-                                                        closest = map.getPrimaryAlias();
-                                                        distance = 0;
-                                                        found.add(map.getPrimaryAlias());
-                                                    } else if (alias.contains(arg)) {
-                                                        closest = map.getPrimaryAlias();
-                                                        distance = 1;
-                                                        found.add(map.getPrimaryAlias());
-                                                    } else if (StringMan.isEqualIgnoreCaseToAny(arg, descSplit)) {
-                                                        closest = map.getPrimaryAlias();
-                                                        distance = 1;
-                                                        found.add(map.getPrimaryAlias());
-                                                    } else {
-                                                        int currentDist = StringMan.getLevenshteinDistance(alias, arg);
-                                                        if (currentDist < distance) {
-                                                            distance = currentDist;
-                                                            closest = map.getPrimaryAlias();
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                            found.add(closest);
-                                            displayFailure(BBC.HELP_SUGGEST.f(arg, StringMan.join(found, ", ")));
-                                            return;
-                                        }
-                                        String msg = String.format("The sub-command '%s' under '%s' could not be found.",
-                                                command, Joiner.on(" ").join(visited));
-                                        displayFailure(msg);
-                                        return;
-                                    }
-                                    visited.add(args.getString(i));
-                                    isRootLevel = false;
-                                } else {
-                                    String msg = String.format("'%s' has no sub-commands. (Maybe '%s' is for a parameter?)",
-                                            Joiner.on(" ").join(visited), command);
-                                    displayFailure(msg);
-                                    return;
-                                }
-                            }
-                            if (!(callable instanceof Dispatcher)) {
-                                // TODO interactive box
-                                String cmd = "/" + Joiner.on(" ").join(visited);
-                                displayUsage(callable, cmd);
-                                return;
-                            }
-                            dispatcher = (Dispatcher) callable;
-                            aliases = new ArrayList<>(dispatcher.getCommands());
-                            prefixes = Collections.nCopies(aliases.size(), "");
-                        } else {
-                            aliases = new ArrayList<>();
-                            prefixes = new ArrayList<>();
-                            for (Map.Entry<CommandMapping, String> entry : mappings.entrySet()) {
-                                aliases.add(entry.getKey());
-                                prefixes.add(entry.getValue());
-                            }
-                        }
-                        page = Math.max(0, page);
-                    } else if (grouped.size() > 1) {
-                        displayCategories(grouped);
-                        return;
-                    }
-                }
-                aliases.sort(new PrimaryAliasComparator(PlatformCommandManager.COMMAND_CLEAN_PATTERN));
-
-                // Calculate pagination
-                int offset = perPage * Math.max(0, page);
-                int pageTotal = (int) Math.ceil(aliases.size() / (double) perPage);
-
-                // Box
-                if (offset >= aliases.size()) {
-                    displayFailure(String.format("There is no page %d (total number of pages is %d).", page + 1, pageTotal));
-                } else {
-                    int end = Math.min(offset + perPage, aliases.size());
-                    List<CommandMapping> subAliases = aliases.subList(offset, end);
-                    List<String> subPrefixes = prefixes.subList(offset, end);
-                    Map<CommandMapping, String> commandMap = IntStream.range(0, subAliases.size()).boxed().collect(Collectors.toMap(subAliases::get, subPrefixes::get, (a, b) -> b, LinkedHashMap::new));
-                    String visitedString = Joiner.on(" ").join(visited);
-                    displayCommands(commandMap, visitedString, page, pageTotal, effectiveLength);
-                }
-            } else {
-                String cmd = "/" + Joiner.on(" ").join(visited);
-                displayUsage(callable, cmd);
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    public abstract void displayFailure(String message);
-
-    public abstract void displayUsage(CommandCallable callable, String command);
-
-    public abstract void displayCategories(Map<String, Map<CommandMapping, String>> categories);
-
-    public abstract void displayCommands(Map<CommandMapping, String> commandMap, String visited, int page, int pageTotal, int effectiveLength);
-}