From 15d0d16da65c66359b6ec5bff44d6cfe2dc43be0 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 16 Aug 2018 00:31:44 +1000 Subject: [PATCH] Update the tips to reflect 1.13 changes --- .../src/main/java/com/boydti/fawe/config/BBC.java | 7 +++++++ .../java/com/sk89q/worldedit/command/RegionCommands.java | 2 +- .../com/sk89q/worldedit/command/SelectionCommands.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/worldedit-core/src/main/java/com/boydti/fawe/config/BBC.java b/worldedit-core/src/main/java/com/boydti/fawe/config/BBC.java index 0827e75dd..7461584c1 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/config/BBC.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/config/BBC.java @@ -302,6 +302,7 @@ public enum BBC { TIP_SELECT_CONNECTED("Tip: Select all connected blocks with //sel fuzzy", "Tips"), TIP_SET_POS1("Tip: Use pos1 as a pattern with &c//set pos1", "Tips"), TIP_FARWAND("Tip: Select distant points with &c//farwand", "Tips"), + TIP_DISCORD("Need help using FAWE? https://discord.gg/ngZCzbU", "Tips"), // cut TIP_LAZYCUT("&7Tip: It is safer to use &c//lazycut", "Tips"), @@ -315,6 +316,12 @@ public enum BBC { TIP_SET_HAND("&7Tip: Use your current hand with &c//set hand", "Tips"), // replace + TIP_REPLACE_REGEX("&7Tip: Replace using regex:&c //replace .*_log ", "Tips"), + TIP_REPLACE_REGEX_2("&7Tip: Replace using regex:&c //replace .*stairs[facing=(north|south)] ", "Tips"), + TIP_REPLACE_REGEX_3("&7Tip: Replace using operators:&c //replace water[level>2] sand", "Tips"), + TIP_REPLACE_REGEX_4("&7Tip: Replace using operators:&c //replace true *[waterlogged=false]", "Tips"), + TIP_REPLACE_REGEX_5("&7Tip: Replace using operators:&c //replace true *[level-=1]", "Tips"), + TIP_REPLACE_ID("&7Tip: Replace only the block id:&c //replace woodenstair #id[cobblestair]", "Tips"), TIP_REPLACE_LIGHT("Tip: Remove light sources with&c //replace #brightness[1][15] 0", "Tips"), TIP_TAB_COMPLETE("Tip: The replace command supports tab completion", "Tips"), diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java index 3924546ca..4b01611ed 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java @@ -310,7 +310,7 @@ public class RegionCommands extends MethodCommands { int affected = editSession.replaceBlocks(region, from, to); BBC.VISITOR_BLOCK.send(player, affected); if (!player.hasPermission("fawe.tips")) - BBC.TIP_REPLACE_ID.or(BBC.TIP_REPLACE_LIGHT, BBC.TIP_REPLACE_MARKER, BBC.TIP_TAB_COMPLETE).send(player); + BBC.TIP_REPLACE_ID.or(BBC.TIP_REPLACE_LIGHT, BBC.TIP_REPLACE_MARKER, BBC.TIP_TAB_COMPLETE, BBC.TIP_REPLACE_REGEX, BBC.TIP_REPLACE_REGEX_2, BBC.TIP_REPLACE_REGEX_3, BBC.TIP_REPLACE_REGEX_4, BBC.TIP_REPLACE_REGEX_5).send(player); } // Compatibility for SKCompat diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java index f252e4ca4..e9b5efc5a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java @@ -289,7 +289,7 @@ public class SelectionCommands { player.giveItem(new BaseItemStack(we.getConfiguration().wandItem, 1)); BBC.SELECTION_WAND.send(player); if (!FawePlayer.wrap(player).hasPermission("fawe.tips")) - BBC.TIP_SEL_LIST.or(BBC.TIP_SELECT_CONNECTED, BBC.TIP_SET_POS1, BBC.TIP_FARWAND).send(player); + BBC.TIP_SEL_LIST.or(BBC.TIP_SELECT_CONNECTED, BBC.TIP_SET_POS1, BBC.TIP_FARWAND, BBC.TIP_DISCORD).send(player); } @Command(