aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
index f8823589..3e933f1a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
@@ -1,15 +1,10 @@
package de.hysky.skyblocker.skyblock.chat;
-import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import de.hysky.skyblocker.SkyblockerMod;
-import de.hysky.skyblocker.skyblock.shortcut.Shortcuts;
import de.hysky.skyblocker.utils.Utils;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
-import net.fabricmc.fabric.api.client.message.v1.ClientSendMessageEvents;
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
import org.slf4j.Logger;
@@ -78,14 +73,16 @@ public class ChatRulesHandler {
if (rule.isMatch(plain)) {
//get a replacement message
Text newMessage;
- if (!rule.getReplaceMessage().isEmpty()){
+ if (!rule.getReplaceMessage().isBlank()){
newMessage = Text.of(rule.getReplaceMessage());
}
else {
newMessage =message;
}
- //todo show announcement
+ if (rule.getShowAnnouncement()){
+ ChatRuleAnnouncementScreen.setText(newMessage);
+ }
//show in action bar
if (rule.getShowActionBar() && CLIENT.player != null) {
@@ -102,7 +99,7 @@ public class ChatRulesHandler {
return true;
}
private static String trimItemColor(String str) {
- if (str.isEmpty()) return str;
+ if (str.isBlank()) return str;
return str.replaceAll("ยง[0-9a-g]", "");
}