Add property suggestions for hand,offhand,pos1 patterns (#2269)

Author: me4502

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/SuggestionHelper.java

@@ -65,8 +65,7 @@ public static Stream<String> getBlockCategorySuggestions(String tag, boolean all
         return Stream.empty();
     }
 
-    public static Stream<String> getBlockPropertySuggestions(String blockType, String props) {
-        BlockType type = BlockTypes.get(blockType.toLowerCase(Locale.ROOT));
+    public static Stream<String> getBlockPropertySuggestions(String blockTypeString, BlockType type, String props) {
         if (type == null) {
             return Stream.empty();
         }
@@ -83,7 +82,7 @@ public static Stream<String> getBlockPropertySuggestions(String blockType, Strin
                 // suggest for next property
                 String previous = Arrays.stream(propParts, 0, propParts.length - 1).collect(Collectors.joining(","))
                         + (propParts.length == 1 ? "" : ",");
-                String lastValidInput = (blockType + "[" + previous).toLowerCase(Locale.ROOT);
+                String lastValidInput = (blockTypeString + "[" + previous).toLowerCase(Locale.ROOT);
                 if (propVal.length == 1) {
                     // only property, no value yet
                     final List<? extends Property<?>> matchingProps = propertyMap.entrySet().stream()

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java

@@ -21,6 +21,7 @@
 
 import com.google.common.collect.Maps;
 import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.NotABlockException;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
@@ -222,23 +223,52 @@ private static Map<Property<?>, Object> parseProperties(BlockType type, String[]
     }
 
     @Override
-    public Stream<String> getSuggestions(String input) {
+    public Stream<String> getSuggestions(String input, ParserContext context) {
         final int idx = input.lastIndexOf('[');
         if (idx < 0) {
             return SuggestionHelper.getNamespacedRegistrySuggestions(BlockType.REGISTRY, input);
         }
         String blockType = input.substring(0, idx);
         BlockType type = BlockTypes.get(blockType.toLowerCase(Locale.ROOT));
         if (type == null) {
-            return Stream.empty();
+            var lowerBlockType = blockType.toLowerCase(Locale.ROOT);
+            switch (lowerBlockType) {
+                case "hand", "offhand" -> {
+                    var actor = context.getActor();
+                    if (actor instanceof Player player) {
+                        var itemInHand = player.getItemInHand(lowerBlockType.equals("hand") ? HandSide.MAIN_HAND : HandSide.OFF_HAND);
+                        if (itemInHand.getType().hasBlockType()) {
+                            type = itemInHand.getType().getBlockType();
+                        }
+                    }
+                }
+                case "pos1" -> {
+                    // Get the block type from the "primary position"
+                    World world = context.getWorld();
+                    LocalSession session = context.getSession();
+                    if (world != null && session != null) {
+                        try {
+                            BlockVector3 primaryPosition = session.getRegionSelector(world).getPrimaryPosition();
+                            type = world.getBlock(primaryPosition).getBlockType();
+                        } catch (IncompleteRegionException ignored) {
+                        }
+                    }
+                }
+                default -> {
+                }
+            }
+
+            if (type == null) {
+                return Stream.empty();
+            }
         }
 
         String props = input.substring(idx + 1);
         if (props.isEmpty()) {
             return type.getProperties().stream().map(p -> input + p.getName() + "=");
         }
 
-        return SuggestionHelper.getBlockPropertySuggestions(blockType, props);
+        return SuggestionHelper.getBlockPropertySuggestions(blockType, type, props);
     }
 
     private BaseBlock parseLogic(String input, ParserContext context) throws InputParseException {

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/TypeOrStateApplyingPatternParser.java

@@ -32,8 +32,11 @@
 import com.sk89q.worldedit.internal.registry.InputParser;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -63,7 +66,8 @@ public Stream<String> getSuggestions(String input, ParserContext context) {
             if (type.isEmpty()) {
                 return Stream.empty(); // without knowing a type, we can't really suggest states
             } else {
-                return SuggestionHelper.getBlockPropertySuggestions(type, parts[1]).map(s -> "^" + s);
+                BlockType blockType = BlockTypes.get(type.toLowerCase(Locale.ROOT));
+                return SuggestionHelper.getBlockPropertySuggestions(type, blockType, parts[1]).map(s -> "^" + s);
             }
         }
     }

worldedit-core/src/main/java/com/sk89q/worldedit/internal/registry/AbstractFactory.java

@@ -86,13 +86,13 @@ public E parseFromInput(String input, ParserContext context) throws InputParseEx
 
     @Deprecated
     public List<String> getSuggestions(String input) {
-        return parsers.stream().flatMap(
-            p -> p.getSuggestions(input)
-        ).collect(Collectors.toList());
+        return getSuggestions(input, new ParserContext());
     }
 
     public List<String> getSuggestions(String input, ParserContext context) {
-        return getSuggestions(input);
+        return parsers.stream().flatMap(
+            p -> p.getSuggestions(input, context)
+        ).collect(Collectors.toList());
     }
 
     /**