From f145f562596342174486988ac4df8b7e653c95eb Mon Sep 17 00:00:00 2001 From: XThe <101992755+SirXThe@users.noreply.github.com> Date: Fri, 6 May 2022 00:17:01 +0200 Subject: [PATCH] update regexes and descriptions (#23) * new stuff * double || * looks better --- src/main/java/cc/woverflow/hytils/config/HytilsConfig.java | 4 ++-- .../cc/woverflow/hytils/handlers/language/LanguageData.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/woverflow/hytils/config/HytilsConfig.java b/src/main/java/cc/woverflow/hytils/config/HytilsConfig.java index 0d575943..85b41e00 100644 --- a/src/main/java/cc/woverflow/hytils/config/HytilsConfig.java +++ b/src/main/java/cc/woverflow/hytils/config/HytilsConfig.java @@ -275,8 +275,8 @@ public class HytilsConfig extends Vigilant { public static boolean duelsBlockTrail; @Property( - type = PropertyType.SWITCH, name = "Remove the SkyBlock Welcome Message", - description = "Hides the \"§eWelcome to §aHypixel SkyBlock§e!§r\" from chat.", + type = PropertyType.SWITCH, name = "Remove SkyBlock Welcome Messages", + description = "Removes \"§eWelcome to §aHypixel SkyBlock§e!§r\" messages from chat.", category = "Chat", subcategory = "Toggles" ) public static boolean skyblockWelcome; diff --git a/src/main/java/cc/woverflow/hytils/handlers/language/LanguageData.java b/src/main/java/cc/woverflow/hytils/handlers/language/LanguageData.java index e49e150c..e5c8262f 100644 --- a/src/main/java/cc/woverflow/hytils/handlers/language/LanguageData.java +++ b/src/main/java/cc/woverflow/hytils/handlers/language/LanguageData.java @@ -55,10 +55,10 @@ public class LanguageData { public String chatCleanerReplayRecorded = "This game has been recorded. Click here to watch the Replay!"; private String chatCleanerTip = "(?:You tipped \\d+ (?:player|players) in \\d+ (?:game|different games)!|You already tipped everyone that has boosters active, so there isn't anybody to be tipped right now!)"; private String chatCleanerOnlineStatus = "REMINDER: Your Online Status is currently set to (?:Appear Offline|Busy|Away)"; - private String chatCleanerGameTips = "^(?:If you get disconnected use /rejoin to join back in the game\\.|You may use /mmreport to chat report in this mode!|Teaming with the .+ is not allowed!|Teaming is not allowed.+|Cross Teaming / Teaming with other teams is not allowed!|Cross-teaming is not allowed! Report cross-teamers using /report.|Cages opened! FIGHT!|Queued! Use the bed to return to lobby!|Queued! Use the bed to cancel!|You can use /ic to communicate with your fellow infected!)"; + private String chatCleanerGameTips = "^(?:If you get disconnected use /rejoin to join back in the game\\.|You may use /mmreport to chat report in this mode!|Teaming with the .+ is not allowed!|Teaming is not allowed.+|Cross Teaming / Teaming with other teams is not allowed!|Cross-teaming is not allowed! Report cross-teamers using /report.|Cages opened! FIGHT!|Queued! Use the bed to return to lobby!|Queued! Use the bed to cancel!|You can use /ic to communicate with your fellow infected!|To leave .+, type /lobby)"; private String chatCleanerStats = "Click to view the stats of your .* game!"; - private String connectedServerConnectMessage = "^(You are currently connected to server \\S+)|(Sending you to \\S+.{3}!)|(Sending to server \\S+.{3})|(Warping you to your SkyBlock island...)|(Warping...)|(Sending a visit request...)|(Finding player...)|(Request join for (?:Hub|Dungeon Hub) .{2,4} \\S+.{3})$"; + private String connectedServerConnectMessage = "^(You are currently connected to server \\S+)|(Sending you to \\S+.{3}!)|(Sending to server \\S+.{3})|(Warping you to your SkyBlock island...)|(Warping...)|(Sending a visit request...)|(Finding player...)|(Request join for (?:Hub|Dungeon Hub) .{2,4} \\S+.{3})|(Found an in-progress .+ game! Teleporting you to \\S+.{3}...)$"; private String achievementPattern = "a>> {3}Achievement Unlocked: (?.+) {3}<