Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 04:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Begin fixing layer brush

Browse Source 
- Required new argument parser, which should ultimately be made into a singe blockstate parser for best results, and proper tab-completion
 - The layer brush itself is broken because of the changes to internal block retrieval from legacy
This commit is contained in:
dordsor21
2021-06-10 16:19:23 +01:00
parent 7ef8b2f95e
commit 1fa5f4d725
6 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -96,6 +96,7 @@ import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.mask.SingleBlockTypeMask;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.internal.annotation.PatternList;
import com.sk89q.worldedit.internal.annotation.ClipboardMask;
import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.math.BlockVector3;
@ -108,7 +109,6 @@ import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
import com.sk89q.worldedit.world.block.BlockID;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
@ -632,10 +632,13 @@ public class BrushCommands {
@CommandPermissions("worldedit.brush.layer")
public void surfaceLayer(InjectedValueAccess context,
@Arg(desc = "Expression")
Expression radius, List<BlockState> blockLayers)
Expression radius,
@Arg(desc = "List of comma-separated patterns")
@PatternList()
List<Pattern> patternLayers)
throws WorldEditException {
worldEdit.checkMaxBrushRadius(radius);
set(context, new LayerBrush(blockLayers.toArray(new BlockState[0]))).setSize(radius);
set(context, new LayerBrush(patternLayers.toArray(new Pattern[0]))).setSize(radius);
}
@Command(
@ -683,7 +686,9 @@ public class BrushCommands {
@Arg(desc = "double", def = "1")
double points,
@Arg(desc = "double", def = "1")
double distance, List<String> commandStr)
double distance,
@Arg(desc = "List of comma-separated commands")
List<String> commandStr)
throws WorldEditException {
worldEdit.checkMaxBrushRadius(radius);
set(context,