From 5817285b16bdf1522ab10be70d65be5679e23400 Mon Sep 17 00:00:00 2001 From: Zeranny Date: Wed, 31 Jan 2024 20:07:48 +0000 Subject: [PATCH 1/2] Change offHand to Secondary --- .../worldedit/command/ToolUtilCommands.java | 66 ++++++++++--------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java index 0694b2af31..e323193ec6 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java @@ -27,7 +27,6 @@ import com.fastasyncworldedit.core.util.MathMan; import com.fastasyncworldedit.core.util.StringMan; import com.google.common.collect.Iterables; -import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; @@ -72,8 +71,8 @@ public ToolUtilCommands(WorldEdit we) { @CommandPermissions({"worldedit.brush.options.mask", "worldedit.mask.brush"}) public void mask( Player player, LocalSession session, - @Switch(name = 'h', desc = "Whether the offhand should be considered or not") - boolean offHand, + @Switch(name = 'h', desc = "Modifies the secondary brush") + boolean secondary, @Arg(desc = "The destination mask", def = "") Mask maskOpt, Arguments arguments ) throws WorldEditException { @@ -86,7 +85,7 @@ public void mask( player.print(Caption.of("worldedit.tool.mask.disabled")); tool.setMask(null); } else { - BrushSettings settings = offHand ? tool.getOffHand() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())) .getSubstring(); settings.addSetting(BrushSettings.SettingType.MASK, lastArg); @@ -107,9 +106,9 @@ public void material( Player player, LocalSession session, @Arg(desc = "The pattern of blocks to use") Pattern pattern, - //FAWE start - add offhand - @Switch(name = 'h', desc = "Whether the offhand should be considered or not") - boolean offHand, Arguments arguments + //FAWE start - add secondary + @Switch(name = 'h', desc = "Modifies the secondary brush") + boolean secondary, Arguments arguments ) throws WorldEditException { BrushTool tool = session.getBrushTool(player, false); if (tool == null) { @@ -119,7 +118,7 @@ public void material( if (pattern == null) { tool.setFill(null); } else { - BrushSettings settings = offHand ? tool.getOffHand() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); settings.setFill(pattern); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); settings.addSetting(BrushSettings.SettingType.FILL, lastArg); @@ -152,11 +151,18 @@ public void range( public void size( Player player, LocalSession session, @Arg(desc = "The size of the brush") - int size + int size, + @Switch(name = 'h', desc = "Modifies the secondary brush") + boolean secondary, Arguments arguments ) throws WorldEditException { we.checkMaxBrushRadius(size); + BrushTool tool = session.getBrushTool(player, false); - session.getBrushTool(player).setSize(size); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); + settings.setSize(size); + String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); + settings.addSetting(BrushSettings.SettingType.FILL, lastArg); + tool.update(); player.print(Caption.of("worldedit.tool.size.set")); } @@ -171,12 +177,12 @@ public void traceMask( @Arg(desc = "The trace mask to set", def = "") Mask maskOpt ) throws WorldEditException { - BrushTool brushTool = session.getBrushTool(player, false); - if (brushTool == null) { + BrushTool tool = session.getBrushTool(player, false); + if (tool == null) { player.print(Caption.of("worldedit.brush.none.equipped")); return; } - brushTool.setTraceMask(maskOpt); + tool.setTraceMask(maskOpt); if (maskOpt == null) { player.print(Caption.of("worldedit.tool.tracemask.disabled")); } else { @@ -288,7 +294,7 @@ public void target( ) @CommandPermissions("worldedit.brush.targetoffset") public void targetOffset( - Player player, EditSession editSession, LocalSession session, + Player player, LocalSession session, @Arg(name = "offset", desc = "offset", def = "0") int offset ) throws WorldEditException { BrushTool tool = session.getBrushTool(player, false); @@ -306,22 +312,22 @@ public void targetOffset( ) @CommandPermissions("worldedit.brush.scroll") public void scroll( - Player player, EditSession editSession, LocalSession session, - @Switch(name = 'h', desc = "Whether the offhand should be considered or not") - boolean offHand, + Player player, LocalSession session, + @Switch(name = 'h', desc = "Modifies the secondary brush") + boolean secondary, @Arg(desc = "Target Modes", def = "none") Scroll.Action mode, @Arg(desc = "The scroll action", variable = true) List commandStr ) throws WorldEditException { - BrushTool bt = session.getBrushTool(player, false); - if (bt == null) { + BrushTool tool = session.getBrushTool(player, false); + if (tool == null) { player.print(Caption.of("fawe.worldedit.brush.brush.none")); return; } - BrushSettings settings = offHand ? bt.getOffHand() : bt.getContext(); - Scroll action = Scroll.fromArguments(bt, player, session, mode, commandStr, true); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); + Scroll action = Scroll.fromArguments(tool, player, session, mode, commandStr, true); settings.setScrollAction(action); if (mode == Scroll.Action.NONE) { player.print(Caption.of("fawe.worldedit.brush.brush.scroll.action.unset")); @@ -330,7 +336,7 @@ public void scroll( settings.addSetting(BrushSettings.SettingType.SCROLL_ACTION, full); player.print(Caption.of("fawe.worldedit.brush.brush.scroll.action.set", mode)); } - bt.update(); + tool.update(); } @Command( @@ -341,11 +347,11 @@ public void scroll( ) @CommandPermissions({"worldedit.brush.options.mask", "worldedit.mask.brush"}) public void smask( - Player player, LocalSession session, EditSession editSession, + Player player, LocalSession session, @Arg(desc = "The destination mask", def = "") Mask maskArg, - @Switch(name = 'h', desc = "Whether the offhand should be considered or not") - boolean offHand, + @Switch(name = 'h', desc = "Modifies the secondary brush") + boolean secondary, Arguments arguments ) throws WorldEditException { BrushTool tool = session.getBrushTool(player, false); @@ -358,7 +364,7 @@ public void smask( tool.setSourceMask(null); return; } - BrushSettings settings = offHand ? tool.getOffHand() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); settings.addSetting(BrushSettings.SettingType.SOURCE_MASK, lastArg); settings.setSourceMask(maskArg); @@ -373,10 +379,10 @@ public void smask( ) @CommandPermissions({"worldedit.brush.options.transform", "worldedit.transform.brush"}) public void transform( - Player player, LocalSession session, EditSession editSession, + Player player, LocalSession session, @Arg(desc = "The transform", def = "") ResettableExtent transform, - @Switch(name = 'h', desc = "Whether the offhand should be considered or not") - boolean offHand, + @Switch(name = 'h', desc = "Modifies the secondary brush") + boolean secondary, Arguments arguments ) throws WorldEditException { BrushTool tool = session.getBrushTool(player, false); @@ -389,7 +395,7 @@ public void transform( tool.setTransform(null); return; } - BrushSettings settings = offHand ? tool.getOffHand() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); settings.addSetting(BrushSettings.SettingType.TRANSFORM, lastArg); settings.setTransform(transform); From 6ee126a8af6d1d185e3d34375a904acb4f45d174 Mon Sep 17 00:00:00 2001 From: Zeranny Date: Wed, 31 Jan 2024 20:19:36 +0000 Subject: [PATCH 2/2] getContext > getPrimary --- .../sk89q/worldedit/command/ToolUtilCommands.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java index e323193ec6..24382893a7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java @@ -85,9 +85,8 @@ public void mask( player.print(Caption.of("worldedit.tool.mask.disabled")); tool.setMask(null); } else { - BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); - String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())) - .getSubstring(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary(); + String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); settings.addSetting(BrushSettings.SettingType.MASK, lastArg); settings.setMask(maskOpt); tool.update(); @@ -118,7 +117,7 @@ public void material( if (pattern == null) { tool.setFill(null); } else { - BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary(); settings.setFill(pattern); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); settings.addSetting(BrushSettings.SettingType.FILL, lastArg); @@ -158,7 +157,7 @@ public void size( we.checkMaxBrushRadius(size); BrushTool tool = session.getBrushTool(player, false); - BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary(); settings.setSize(size); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); settings.addSetting(BrushSettings.SettingType.FILL, lastArg); @@ -326,7 +325,7 @@ public void scroll( return; } - BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary(); Scroll action = Scroll.fromArguments(tool, player, session, mode, commandStr, true); settings.setScrollAction(action); if (mode == Scroll.Action.NONE) { @@ -364,7 +363,7 @@ public void smask( tool.setSourceMask(null); return; } - BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); settings.addSetting(BrushSettings.SettingType.SOURCE_MASK, lastArg); settings.setSourceMask(maskArg); @@ -395,7 +394,7 @@ public void transform( tool.setTransform(null); return; } - BrushSettings settings = secondary ? tool.getSecondary() : tool.getContext(); + BrushSettings settings = secondary ? tool.getSecondary() : tool.getPrimary(); String lastArg = Iterables.getLast(CommandArgParser.spaceSplit(arguments.get())).getSubstring(); settings.addSetting(BrushSettings.SettingType.TRANSFORM, lastArg); settings.setTransform(transform);