From 2a9fae47611cec59776e96826db8a6305978e0b1 Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 13 Feb 2024 14:30:22 +0000 Subject: start of implimentation has config ui that dose not save the rules and the basic building blocks for the rest of the feature --- .../config/categories/MessageFilterCategory.java | 17 +- .../hysky/skyblocker/skyblock/chat/ChatRule.java | 226 +++++++++++++++++++++ .../skyblock/chat/ChatRuleConfigScreen.java | 214 +++++++++++++++++++ .../skyblock/chat/ChatRulesConfigListWidget.java | 153 ++++++++++++++ .../skyblock/chat/ChatRulesConfigScreen.java | 110 ++++++++++ .../skyblocker/skyblock/chat/ChatRulesHandler.java | 4 + 6 files changed, 721 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java create mode 100644 src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java create mode 100644 src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java create mode 100644 src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java create mode 100644 src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java (limited to 'src/main/java/de/hysky/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java index acdc8169..18c3bc99 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java @@ -2,10 +2,11 @@ package de.hysky.skyblocker.config.categories; import de.hysky.skyblocker.config.ConfigUtils; import de.hysky.skyblocker.config.SkyblockerConfig; +import de.hysky.skyblocker.skyblock.chat.ChatRulesConfigScreen; +import de.hysky.skyblocker.skyblock.dwarven.CrystalsHudConfigScreen; import de.hysky.skyblocker.utils.chat.ChatFilterResult; -import dev.isxander.yacl3.api.ConfigCategory; -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.api.OptionDescription; +import dev.isxander.yacl3.api.*; +import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; public class MessageFilterCategory { @@ -125,6 +126,16 @@ public class MessageFilterCategory { () -> config.messages.hideDicer, newValue -> config.messages.hideDicer = newValue) .controller(ConfigUtils::createEnumCyclingListController) + //chat rules options + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules")) + .collapsed(false) + .option(ButtonOption.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen")) + .text(Text.translatable("text.skyblocker.open")) + .action((screen, opt) -> MinecraftClient.getInstance().setScreen(new ChatRulesConfigScreen(screen))) + .build()) + .build()) .build(); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java new file mode 100644 index 00000000..ebf0a310 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java @@ -0,0 +1,226 @@ +package de.hysky.skyblocker.skyblock.chat; + +import de.hysky.skyblocker.utils.Utils; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.sound.Sound; +import net.minecraft.item.ItemStack; + +import java.util.List; +import java.util.regex.Pattern; + +/** + * Data class to contain all the settings for a chat rule + */ +public class ChatRule { + + private String name; + //inputs + private Boolean enabled; + private Boolean isPartialMatch; + private Boolean isRegex; + private String filter; + private LocationOption validLocation; + private List validItems; + + //output + private Boolean hideMessage; + private Boolean showActionBar; + private Boolean showAnnouncement; + private String replaceMessage; //todo extract parts of original message + private Sound customSound; + + /** + * Creates a chat rule with default options. + */ + public ChatRule(){ + this.name = "New Rule"; + + this.enabled = true; + this.isPartialMatch = false; + this.isRegex = false; + this.filter = ""; + this.validLocation = LocationOption.None; + this.validItems = List.of(); + + this.hideMessage = true; + this.showActionBar = false; + this.showAnnouncement = false; + this.replaceMessage = null; + this.customSound = null; + } + + + public ChatRule(String name, Boolean enabled, Boolean isPartialMatch, Boolean isRegex, String filter, LocationOption validLocation, List validItems, Boolean hideMessage, Boolean showActionBar, Boolean showAnnouncement, String replaceMessage, Sound customSound) { + this.name = name; + this.enabled = enabled; + this.isPartialMatch = isPartialMatch; + this.isRegex = isRegex; + this.filter = filter; + this.validLocation = validLocation; + this.validItems = validItems; + this.hideMessage = hideMessage; + this.showActionBar = showActionBar; + this.showAnnouncement = showAnnouncement; + this.replaceMessage = replaceMessage; + this.customSound = customSound; + } + + public Boolean getEnabled() { //todo remove unused getters and set + return enabled; + } + + public void setEnabled(Boolean enabled) { + this.enabled = enabled; + } + + public Boolean getPartialMatch() { + return isPartialMatch; + } + + public void setPartialMatch(Boolean partialMatch) { + isPartialMatch = partialMatch; + } + + public Boolean getRegex() { + return isRegex; + } + + public void setRegex(Boolean regex) { + isRegex = regex; + } + + public String getFilter() { + return filter; + } + + public void setFilter(String filter) { + this.filter = filter; + } + + public LocationOption getValidLocation() { + return validLocation; + } + + public void setValidLocation(LocationOption validLocation) { + this.validLocation = validLocation; + } + + public List getValidItems() { + return validItems; + } + + public void setValidItems(List validItems) { + this.validItems = validItems; + } + + public Boolean getHideMessage() { + return hideMessage; + } + + public void setHideMessage(Boolean hideMessage) { + this.hideMessage = hideMessage; + } + + public Boolean getShowActionBar() { + return showActionBar; + } + + public void setShowActionBar(Boolean showActionBar) { + this.showActionBar = showActionBar; + } + + public Boolean getShowAnnouncement() { + return showAnnouncement; + } + + public void setShowAnnouncement(Boolean showAnnouncement) { + this.showAnnouncement = showAnnouncement; + } + + public String getReplaceMessage() { + return replaceMessage; + } + + public void setReplaceMessage(String replaceMessage) { + this.replaceMessage = replaceMessage; + } + + public Sound getCustomSound() { + return customSound; + } + + public void setCustomSound(Sound customSound) { + this.customSound = customSound; + } + + /** + * checks every input option and if the games state and the inputted str matches them returns true. + * @param str the chat message to check if fits + * @return if the inputs are all true and the outputs should be performed + */ + public Boolean isMatch(String str, MinecraftClient client){ + //enabled + if (!enabled) return false; + + //filter + if (filter.isEmpty()) return false; + if(isRegex) { + if (isPartialMatch) { + if (! Pattern.compile(filter).matcher(str).find()) return false; + }else { + if (!str.matches(filter)) return false; + } + } else{ + if (isPartialMatch) { + if (!str.contains(filter)) return false; + }else { + if (!filter.equals(str)) return false; + } + } + + //location + String rawLocation = Utils.getLocationRaw(); + switch (validLocation){ //todo maybe add functionality straight into utils + case Island -> { + if (!rawLocation.equals("private_island")) return false; + } + case Hub -> { + if (!rawLocation.equals("hub")) return false; + } + case Garden -> { + if (!rawLocation.equals("garden")) return false; + } + default -> {} + } + + //held items + if (!validItems.isEmpty()){ + if (client.player == null) return false; + ItemStack heldItem = client.player.getMainHandStack(); + if (!validItems.contains(heldItem)) return false; + } + + return true; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public enum LocationOption { + None, + Island, + Hub, + Garden; //todo add more + + } + + +} + + + diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java new file mode 100644 index 00000000..ef0f6d92 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java @@ -0,0 +1,214 @@ +package de.hysky.skyblocker.skyblock.chat; + +import it.unimi.dsi.fastutil.ints.IntIntPair; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.text.Text; + + +import java.awt.*; + +public class ChatRuleConfigScreen extends Screen { + + private static final int SPACER_X = 5; + private static final int SPACER_Y = 25; + + private ChatRule chatRule; + + //widgets + private ButtonWidget finishButton; + + private TextFieldWidget nameInput; + private TextFieldWidget filterInput; + private ButtonWidget partialMatchToggle; + private ButtonWidget regexToggle; + //todo location dropdown or somthig + //todo item selection thing + + private ButtonWidget hideMessageToggle; + private ButtonWidget actionBarToggle; + private ButtonWidget announcementToggle; + private TextFieldWidget replaceMessageInput; + //todo custom sound thing + + //textLocations + private IntIntPair nameLabelTextPos; + private IntIntPair inputsLabelTextPos; + + private IntIntPair filterLabelTextPos; + private IntIntPair partialMatchTextPos; + private IntIntPair regexTextPos; + + private IntIntPair validLocationLabelTextPos; + + private IntIntPair validItemLabelTextPos; + + private IntIntPair outputsLabelTextPos; + + private IntIntPair hideMessageTextPos; + private IntIntPair actionBarTextPos; + private IntIntPair announcementTextPos; + + private IntIntPair replaceMessageLabelTextPos; + + private IntIntPair customSoundLabelTextPos; + + + private final Screen parent; + + + + public ChatRuleConfigScreen(Screen parent, ChatRule chatRule) { + super(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen")); + this.chatRule = chatRule; + this.parent = parent; + } + + @Override + protected void init() { + super.init(); + if (client == null) return; + + IntIntPair currentPos = IntIntPair.of(5,15); + int lineXOffset = 0; + + nameLabelTextPos = currentPos; + lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name")) + SPACER_X; + nameInput = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 100, 20, Text.of("")); + nameInput.setText(chatRule.getName()); + currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); + + inputsLabelTextPos = currentPos; + currentPos = IntIntPair.of(currentPos.leftInt() + 10 ,currentPos.rightInt() + SPACER_Y); + + filterLabelTextPos = currentPos; + lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter")) + SPACER_X; + filterInput = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of("")); + filterInput.setText(chatRule.getFilter()); + currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); + lineXOffset = 0; + + partialMatchTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); + lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")) + SPACER_X; + partialMatchToggle = ButtonWidget.builder(enabledButtonText(chatRule.getPartialMatch()), a -> { + chatRule.setPartialMatch(!chatRule.getPartialMatch()); + partialMatchToggle.setMessage(enabledButtonText(chatRule.getPartialMatch())); + }) + .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) + .size(75,20) + .build(); + lineXOffset += 75 + SPACER_X; + regexTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); + lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex")) + SPACER_X; + regexToggle = ButtonWidget.builder(enabledButtonText(chatRule.getRegex()), a -> { + chatRule.setRegex(!chatRule.getRegex()); + regexToggle.setMessage(enabledButtonText(chatRule.getRegex())); + }) + .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) + .size(75,20) + .build(); + currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); + + + outputsLabelTextPos = IntIntPair.of(currentPos.leftInt() - 10,currentPos.rightInt()); + currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); + + hideMessageTextPos = currentPos; + lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage")) + SPACER_X; + hideMessageToggle = ButtonWidget.builder(enabledButtonText(chatRule.getHideMessage()), a -> { + chatRule.setHideMessage(!chatRule.getHideMessage()); + hideMessageToggle.setMessage(enabledButtonText(chatRule.getHideMessage())); + }) + .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) + .size(75,20) + .build(); + lineXOffset += 75 + SPACER_X; + actionBarTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); + lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar")) + SPACER_X; + actionBarToggle = ButtonWidget.builder(enabledButtonText(chatRule.getShowActionBar()), a -> { + chatRule.setShowActionBar(!chatRule.getShowActionBar()); + actionBarToggle.setMessage(enabledButtonText(chatRule.getShowActionBar())); + }) + .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) + .size(75,20) + .build(); + lineXOffset = 0; + currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); + + announcementTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); + lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement")) + SPACER_X; + announcementToggle = ButtonWidget.builder(enabledButtonText(chatRule.getShowAnnouncement()), a -> { + chatRule.setShowAnnouncement(!chatRule.getShowAnnouncement()); + announcementToggle.setMessage(enabledButtonText(chatRule.getShowAnnouncement())); + }) + .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) + .size(75,20) + .build(); + currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); + replaceMessageLabelTextPos = currentPos; + lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace")) + SPACER_X; + replaceMessageInput = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of("")); + replaceMessageInput.setText(chatRule.getReplaceMessage()); + + finishButton = ButtonWidget.builder(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.finish"), a -> { + close(); + }) + .position((int) (this.width * 0.66), this.height - SPACER_Y) + .size(75,20) + .build(); + + + + addDrawableChild(nameInput); + addDrawableChild(filterInput); + addDrawableChild(partialMatchToggle); + addDrawableChild(regexToggle); + addDrawableChild(hideMessageToggle); + addDrawableChild(actionBarToggle); + addDrawableChild(announcementToggle); + addDrawableChild(replaceMessageInput); + addDrawableChild(finishButton); + + + } + + private Text enabledButtonText(boolean enabled) { + if (enabled){ + return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.green.getRGB()); + }else { + return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.false").withColor(Color.red.getRGB()); + } + } + + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + super.render(context, mouseX, mouseY, delta); + context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 16, 0xFFFFFF); + + //draw labels ands text + int yOffset = (SPACER_Y - this.textRenderer.fontHeight) / 2; + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt()+ yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt()+ yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt()+ yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt()+ yOffset, 0xFFFFFF); + //context.drawTextWithShadow(this.textRenderer,"valid", validItemLabelTextPos.leftInt(), validItemLabelTextPos.rightInt(), 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt()+ yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt()+ yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt()+ yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt()+ yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt()+ yOffset, 0xFFFFFF); + } + + @Override + public void close() { + //todo add checks to see if valid rule e.g. has name + //and if valid save a + if (client != null ) { + client.setScreen(parent); + } + } +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java new file mode 100644 index 00000000..e5f7ddef --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java @@ -0,0 +1,153 @@ +package de.hysky.skyblocker.skyblock.chat; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; +import net.minecraft.client.gui.screen.narration.NarrationPart; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.ElementListWidget; +import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; + +import java.awt.*; +import java.util.List; + +public class ChatRulesConfigListWidget extends ElementListWidget { + + private List chatRules; + + private final ChatRulesConfigScreen screen; + + public ChatRulesConfigListWidget(MinecraftClient minecraftClient, ChatRulesConfigScreen screen, int width, int height, int y, int itemHeight) { + super(minecraftClient, width, height, y, itemHeight); + this.screen = screen; + chatRules = List.of(); //todo load existing + //add entry fall all existing rules + for (ChatRule rule : chatRules){ + addEntry(new chatRuleConfigEntry(rule)); + } + } + + @Override + public void setSelected(@Nullable ChatRulesConfigListWidget.chatRuleConfigEntry entry) { + super.setSelected(entry); + screen.updateButtons(); + } + + protected void addRuleAfterSelected() { + children().add(children().indexOf(getSelectedOrNull()) + 1, new chatRuleConfigEntry(new ChatRule())); + } + + protected boolean removeEntry(chatRuleConfigEntry entry) { + return super.removeEntry(entry); + } + + + protected void saveRules() { + //todo save rules + /* + shortcutMaps.forEach(Map::clear); + getNotEmptyShortcuts().forEach(ShortcutsConfigListWidget.ShortcutEntry::save); + Shortcuts.saveShortcuts(MinecraftClient.getInstance()); // Save shortcuts to disk + */ + } + + public class chatRuleConfigEntry extends ElementListWidget.Entry { + + private static final int SPACING = 20; + + //data + private ChatRule chatRule; + + + private final List children; + + //widgets + private final ButtonWidget enabledWidget; + private final ButtonWidget openConfigWidget; + + //text locations + private final int labelX; + private final int enabledX; + + + public chatRuleConfigEntry(ChatRule chatRule) { + this.chatRule = chatRule; + + //initialize the widgets + int currentX = width / 2 - 160; + labelX = currentX; + currentX += client.textRenderer.getWidth("Rule: \"" + chatRule.getName() + "\""); + currentX += SPACING; //spacer + + enabledX = currentX; + currentX += client.textRenderer.getWidth("Enabled:"); + enabledWidget = ButtonWidget.builder(enabledButtonText() , a -> { + toggleEnabled(); + }) + .size(50,20) + .position(currentX,5) + .build() + ; + currentX += 50; + currentX += SPACING; //spacer + + openConfigWidget = ButtonWidget.builder(Text.of("Edit Rule"), a -> { + client.setScreen(new ChatRuleConfigScreen(screen, chatRule)); + }) + .size(100,20) + .position(currentX,5) + .build() + ; + + children = List.of(enabledWidget, openConfigWidget); + } + + private Text enabledButtonText() { + if (chatRule.getEnabled()){ + return Text.literal("TRUE").withColor(Color.green.getRGB()); + }else { + return Text.literal("FALSE").withColor(Color.red.getRGB()); + } + } + private void toggleEnabled() { + chatRule.setEnabled(!chatRule.getEnabled()); + enabledWidget.setMessage(enabledButtonText()); + } + + @Override + public List selectableChildren() { + return List.of(new Selectable() { + @Override + public SelectionType getType() { + return SelectionType.HOVERED; + } + + @Override + public void appendNarrations(NarrationMessageBuilder builder) { + builder.put(NarrationPart.TITLE); //todo add more e.g. , targetName, replacementName + } + }); + } + + @Override + public List children() { + return children; + } + + @Override + public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { //todo get strings form en_us.json + //widgets + enabledWidget.setY(y); + enabledWidget.render(context, mouseX, mouseY, tickDelta); + openConfigWidget.setY(y); + openConfigWidget.render(context, mouseX, mouseY, tickDelta); + //text + context.drawTextWithShadow(client.textRenderer, "Rule: \"" + chatRule.getName() + "\"", labelX, y + 5, 0xFFFFFF); + context.drawTextWithShadow(client.textRenderer, "enabled:", enabledX, y + 5, 0xFFFFFF); + } + } +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java new file mode 100644 index 00000000..be55e60e --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java @@ -0,0 +1,110 @@ +package de.hysky.skyblocker.skyblock.chat; + +import de.hysky.skyblocker.skyblock.shortcut.Shortcuts; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ConfirmScreen; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.tooltip.Tooltip; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.GridWidget; +import net.minecraft.client.gui.widget.SimplePositioningWidget; +import net.minecraft.screen.ScreenTexts; +import net.minecraft.text.Text; + +public class ChatRulesConfigScreen extends Screen { + + private ChatRulesConfigListWidget chatRulesConfigListWidget; + private ButtonWidget buttonDelete; + private ButtonWidget buttonNew; + private ButtonWidget buttonDone; + private double scrollAmount; + private final Screen parent; + + public ChatRulesConfigScreen() { + this(null); + } + + public ChatRulesConfigScreen(Screen parent) { + super(Text.translatable("skyblocker.shortcuts.config")); //todo correct name for whole code + this.parent = parent; + } + + @Override + public void setTooltip(Text tooltip) { + super.setTooltip(tooltip); + } + + @Override + protected void init() { + super.init(); + chatRulesConfigListWidget = new ChatRulesConfigListWidget(client, this, width, height - 96, 32, 25); + addDrawableChild(chatRulesConfigListWidget); + GridWidget gridWidget = new GridWidget(); + gridWidget.getMainPositioner().marginX(5).marginY(2); + GridWidget.Adder adder = gridWidget.createAdder(2); + buttonDelete = ButtonWidget.builder(Text.translatable("selectServer.delete"), button -> { + ChatRulesConfigListWidget.chatRuleConfigEntry currentChatRuleConfigEntry = chatRulesConfigListWidget.getSelectedOrNull(); + if (client != null && currentChatRuleConfigEntry != null ) { + scrollAmount = chatRulesConfigListWidget.getScrollAmount(); + client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("skyblocker.shortcuts.deleteQuestion"), Text.translatable("skyblocker.shortcuts.deleteWarning", currentChatRuleConfigEntry), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL)); //todo load text for this config + } + }).build(); + adder.add(buttonDelete); + buttonNew = ButtonWidget.builder(Text.translatable("skyblocker.shortcuts.new"), buttonNew -> chatRulesConfigListWidget.addRuleAfterSelected()).build(); + adder.add(buttonNew); + adder.add(ButtonWidget.builder(ScreenTexts.CANCEL, button -> { + if (client != null) { + close(); + } + }).build()); + buttonDone = ButtonWidget.builder(ScreenTexts.DONE, button -> { + chatRulesConfigListWidget.saveRules(); + if (client != null) { + close(); + } + }).tooltip(Tooltip.of(Text.translatable("skyblocker.shortcuts.commandSuggestionTooltip"))).build(); + adder.add(buttonDone); + gridWidget.refreshPositions(); + SimplePositioningWidget.setPos(gridWidget, 0, this.height - 64, this.width, 64); + gridWidget.forEachChild(this::addDrawableChild); + updateButtons(); + } + + private void deleteEntry(boolean confirmedAction) { + if (client != null) { + ChatRulesConfigListWidget.chatRuleConfigEntry currentChatRuleConfigEntry = chatRulesConfigListWidget.getSelectedOrNull(); + if (confirmedAction && currentChatRuleConfigEntry != null) { + chatRulesConfigListWidget.removeEntry(currentChatRuleConfigEntry); + } + client.setScreen(this); // Re-inits the screen and keeps the old instance of ShortcutsConfigListWidget + chatRulesConfigListWidget.setScrollAmount(scrollAmount); + } + } + + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + super.render(context, mouseX, mouseY, delta); + context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 16, 0xFFFFFF); + } + + @Override + public void close() { + if (client != null ) { //todo && chatRuleConfigListWidget.hasChanges() + client.setScreen(new ConfirmScreen(confirmedAction -> { + if (confirmedAction) { + this.client.setScreen(parent); + } else { + client.setScreen(this); + } + }, Text.translatable("text.skyblocker.quit_config"), Text.translatable("text.skyblocker.quit_config_sure"), Text.translatable("text.skyblocker.quit_discard"), ScreenTexts.CANCEL)); + } else { + this.client.setScreen(parent); + } + } + + protected void updateButtons() { + buttonDelete.active = Shortcuts.isShortcutsLoaded() && chatRulesConfigListWidget.getSelectedOrNull() != null; + buttonNew.active = Shortcuts.isShortcutsLoaded() ; //todo ? && chatRuleConfigListWidget.getCategory().isPresent() + buttonDone.active = Shortcuts.isShortcutsLoaded(); + } +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java new file mode 100644 index 00000000..4ea8c24d --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java @@ -0,0 +1,4 @@ +package de.hysky.skyblocker.skyblock.chat; + +public class ChatRulesHandler { +} -- cgit From b9aeadfc2fe33b60555f978c82bef0294286e92a Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 15 Feb 2024 11:01:38 +0000 Subject: makes the config ui work the ui works and lets the user configure the rules but has a few quirks to fix in a later commit as it is usable for now --- .../java/de/hysky/skyblocker/SkyblockerMod.java | 2 + .../hysky/skyblocker/skyblock/chat/ChatRule.java | 42 +++++--------- .../skyblock/chat/ChatRuleConfigScreen.java | 20 ++++--- .../skyblock/chat/ChatRulesConfigListWidget.java | 57 +++++++++++++------ .../skyblock/chat/ChatRulesConfigScreen.java | 6 +- .../skyblocker/skyblock/chat/ChatRulesHandler.java | 65 ++++++++++++++++++++++ 6 files changed, 137 insertions(+), 55 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java index 71623ea7..2ee6120e 100644 --- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java +++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java @@ -6,6 +6,7 @@ import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.debug.Debug; import de.hysky.skyblocker.skyblock.*; import de.hysky.skyblocker.skyblock.crimson.kuudra.Kuudra; +import de.hysky.skyblocker.skyblock.chat.ChatRulesHandler; import de.hysky.skyblocker.skyblock.dungeon.*; import de.hysky.skyblocker.skyblock.dungeon.partyfinder.PartyFinderScreen; import de.hysky.skyblocker.skyblock.dungeon.puzzle.CreeperBeams; @@ -107,6 +108,7 @@ public class SkyblockerMod implements ClientModInitializer { CrystalsLocationsManager.init(); ChatMessageListener.init(); Shortcuts.init(); + ChatRulesHandler.init(); DiscordRPCManager.init(); LividColor.init(); FishingHelper.init(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java index ebf0a310..e212b2a0 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java @@ -1,6 +1,7 @@ package de.hysky.skyblocker.skyblock.chat; import de.hysky.skyblocker.utils.Utils; +import dev.isxander.yacl3.config.v2.api.SerialEntry; import net.minecraft.client.MinecraftClient; import net.minecraft.client.sound.Sound; import net.minecraft.item.ItemStack; @@ -13,22 +14,21 @@ import java.util.regex.Pattern; */ public class ChatRule { - private String name; + public String name; //inputs - private Boolean enabled; - private Boolean isPartialMatch; - private Boolean isRegex; - private String filter; - private LocationOption validLocation; - private List validItems; - //output - private Boolean hideMessage; - private Boolean showActionBar; - private Boolean showAnnouncement; - private String replaceMessage; //todo extract parts of original message - private Sound customSound; + public Boolean enabled; + public Boolean isPartialMatch; + public Boolean isRegex; + public String filter; + public LocationOption validLocation; + //output + public Boolean hideMessage; + public Boolean showActionBar; + public Boolean showAnnouncement; + public String replaceMessage; //todo extract parts of original message + public Sound customSound; /** * Creates a chat rule with default options. */ @@ -40,7 +40,6 @@ public class ChatRule { this.isRegex = false; this.filter = ""; this.validLocation = LocationOption.None; - this.validItems = List.of(); this.hideMessage = true; this.showActionBar = false; @@ -57,7 +56,6 @@ public class ChatRule { this.isRegex = isRegex; this.filter = filter; this.validLocation = validLocation; - this.validItems = validItems; this.hideMessage = hideMessage; this.showActionBar = showActionBar; this.showAnnouncement = showAnnouncement; @@ -105,13 +103,7 @@ public class ChatRule { this.validLocation = validLocation; } - public List getValidItems() { - return validItems; - } - public void setValidItems(List validItems) { - this.validItems = validItems; - } public Boolean getHideMessage() { return hideMessage; @@ -146,7 +138,7 @@ public class ChatRule { } public Sound getCustomSound() { - return customSound; + return customSound; } public void setCustomSound(Sound customSound) { @@ -193,12 +185,6 @@ public class ChatRule { default -> {} } - //held items - if (!validItems.isEmpty()){ - if (client.player == null) return false; - ItemStack heldItem = client.player.getMainHandStack(); - if (!validItems.contains(heldItem)) return false; - } return true; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java index ef0f6d92..0dc912d2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java @@ -16,7 +16,8 @@ public class ChatRuleConfigScreen extends Screen { private static final int SPACER_X = 5; private static final int SPACER_Y = 25; - private ChatRule chatRule; + private final int chatRuleIndex; + private final ChatRule chatRule; //widgets private ButtonWidget finishButton; @@ -61,9 +62,10 @@ public class ChatRuleConfigScreen extends Screen { - public ChatRuleConfigScreen(Screen parent, ChatRule chatRule) { + public ChatRuleConfigScreen(Screen parent, int chatRuleIndex) { super(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen")); - this.chatRule = chatRule; + this.chatRuleIndex = chatRuleIndex; + this.chatRule = ChatRulesHandler.chatRuleList.get(chatRuleIndex); this.parent = parent; } @@ -160,8 +162,6 @@ public class ChatRuleConfigScreen extends Screen { .size(75,20) .build(); - - addDrawableChild(nameInput); addDrawableChild(filterInput); addDrawableChild(partialMatchToggle); @@ -171,8 +171,6 @@ public class ChatRuleConfigScreen extends Screen { addDrawableChild(announcementToggle); addDrawableChild(replaceMessageInput); addDrawableChild(finishButton); - - } private Text enabledButtonText(boolean enabled) { @@ -208,7 +206,15 @@ public class ChatRuleConfigScreen extends Screen { //todo add checks to see if valid rule e.g. has name //and if valid save a if (client != null ) { + save(); client.setScreen(parent); } } + private void save(){ + chatRule.setName(nameInput.getText()); + chatRule.setFilter(filterInput.getText()); + chatRule.setReplaceMessage(replaceMessageInput.getText()); + + ChatRulesHandler.chatRuleList.set(chatRuleIndex,chatRule); + } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java index e5f7ddef..07397f98 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java @@ -4,7 +4,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.screen.narration.NarrationPart; import net.minecraft.client.gui.widget.ButtonWidget; @@ -17,20 +16,31 @@ import java.util.List; public class ChatRulesConfigListWidget extends ElementListWidget { - private List chatRules; private final ChatRulesConfigScreen screen; + private Boolean hasChanged; + public ChatRulesConfigListWidget(MinecraftClient minecraftClient, ChatRulesConfigScreen screen, int width, int height, int y, int itemHeight) { super(minecraftClient, width, height, y, itemHeight); this.screen = screen; - chatRules = List.of(); //todo load existing + this.hasChanged = false; //add entry fall all existing rules - for (ChatRule rule : chatRules){ - addEntry(new chatRuleConfigEntry(rule)); + for (int i = 0; i < (long) ChatRulesHandler.chatRuleList.size(); i++){ + addEntry(new chatRuleConfigEntry(i)); } } + @Override + public int getRowWidth() { + return super.getRowWidth() + 100; + } + + @Override + protected int getScrollbarPositionX() { + return super.getScrollbarPositionX() + 50; + } + @Override public void setSelected(@Nullable ChatRulesConfigListWidget.chatRuleConfigEntry entry) { super.setSelected(entry); @@ -38,31 +48,38 @@ public class ChatRulesConfigListWidget extends ElementListWidget { + + protected boolean hasChanges(){ + return (hasChanged || children().stream().anyMatch(chatRuleConfigEntry::hasChange)); + } + + public class chatRuleConfigEntry extends Entry { private static final int SPACING = 20; //data + private int chatRuleIndex; private ChatRule chatRule; + private final List children; //widgets @@ -74,8 +91,9 @@ public class ChatRulesConfigListWidget extends ElementListWidget { - client.setScreen(new ChatRuleConfigScreen(screen, chatRule)); + client.setScreen(new ChatRuleConfigScreen(screen, chatRuleIndex)); }) .size(100,20) .position(currentX,5) @@ -114,10 +132,13 @@ public class ChatRulesConfigListWidget extends ElementListWidget selectableChildren() { return List.of(new Selectable() { @@ -149,5 +170,9 @@ public class ChatRulesConfigListWidget extends ElementListWidget { if (confirmedAction) { this.client.setScreen(parent); @@ -103,8 +103,6 @@ public class ChatRulesConfigScreen extends Screen { } protected void updateButtons() { - buttonDelete.active = Shortcuts.isShortcutsLoaded() && chatRulesConfigListWidget.getSelectedOrNull() != null; - buttonNew.active = Shortcuts.isShortcutsLoaded() ; //todo ? && chatRuleConfigListWidget.getCategory().isPresent() - buttonDone.active = Shortcuts.isShortcutsLoaded(); + buttonDelete.active = chatRulesConfigListWidget.getSelectedOrNull() != null; } } 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 4ea8c24d..dc2ab0f1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java @@ -1,4 +1,69 @@ 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 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.text.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.lang.reflect.Type; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class ChatRulesHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(ChatRule.class); + private static final Path CHAT_RULE_FILE = SkyblockerMod.CONFIG_DIR.resolve("chatRules.json"); + + protected static final List chatRuleList = new ArrayList<>(); + + public static void init() { + loadChatRules(); + ClientReceiveMessageEvents.GAME.register(ChatRulesHandler::checkMessage); + } + + private static void loadChatRules() { + try (BufferedReader reader = Files.newBufferedReader(CHAT_RULE_FILE)) { + Type chatRulesType = new TypeToken>>() { + }.getType(); + Map> chatRules = SkyblockerMod.GSON.fromJson(reader,chatRulesType); + chatRuleList.addAll(chatRules.get("rules")); + + LOGGER.info("[Skyblocker] Loaded chat rules"); + } catch (NoSuchFileException e) { + //todo create default chat rules + LOGGER.warn("[Skyblocker] chat rule file not found, using default rules. This is normal when using for the first time."); + } catch (IOException e) { + LOGGER.error("[Skyblocker] Failed to load shortcuts file", e); + } + } + + protected static void saveChatRules() { + JsonObject chatRuleJson = new JsonObject(); + chatRuleJson.add("rules", SkyblockerMod.GSON.toJsonTree(chatRuleList)); + try (BufferedWriter writer = Files.newBufferedWriter(CHAT_RULE_FILE)) { + SkyblockerMod.GSON.toJson(chatRuleJson, writer); + LOGGER.info("[Skyblocker] Saved chat rules file"); + } catch (IOException e) { + LOGGER.error("[Skyblocker] Failed to save chat rules file", e); + } + } + + private static void checkMessage(Text message, Boolean overlay) { + + } + } -- cgit From 4d0d772537648d424631a1a932780601a642b1a5 Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 15 Feb 2024 15:23:50 +0000 Subject: make the rules acutaly work now scans each chat message with the rules to see if they match --- .../config/categories/MessageFilterCategory.java | 1 + .../hysky/skyblocker/skyblock/chat/ChatRule.java | 30 +++++++++++---- .../skyblocker/skyblock/chat/ChatRulesHandler.java | 44 +++++++++++++++++++++- 3 files changed, 65 insertions(+), 10 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java index 18c3bc99..ddad018a 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java @@ -126,6 +126,7 @@ public class MessageFilterCategory { () -> config.messages.hideDicer, newValue -> config.messages.hideDicer = newValue) .controller(ConfigUtils::createEnumCyclingListController) + .build()) //chat rules options .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules")) diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java index e212b2a0..afc409ac 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java @@ -20,6 +20,7 @@ public class ChatRule { public Boolean enabled; public Boolean isPartialMatch; public Boolean isRegex; + public Boolean isIgnoreCase; public String filter; public LocationOption validLocation; @@ -38,6 +39,7 @@ public class ChatRule { this.enabled = true; this.isPartialMatch = false; this.isRegex = false; + this.isIgnoreCase = true; this.filter = ""; this.validLocation = LocationOption.None; @@ -49,11 +51,12 @@ public class ChatRule { } - public ChatRule(String name, Boolean enabled, Boolean isPartialMatch, Boolean isRegex, String filter, LocationOption validLocation, List validItems, Boolean hideMessage, Boolean showActionBar, Boolean showAnnouncement, String replaceMessage, Sound customSound) { + public ChatRule(String name, Boolean enabled, Boolean isPartialMatch, Boolean isRegex, Boolean isIgnoreCase, String filter, LocationOption validLocation, List validItems, Boolean hideMessage, Boolean showActionBar, Boolean showAnnouncement, String replaceMessage, Sound customSound) { this.name = name; this.enabled = enabled; this.isPartialMatch = isPartialMatch; this.isRegex = isRegex; + this.isIgnoreCase = isIgnoreCase; this.filter = filter; this.validLocation = validLocation; this.hideMessage = hideMessage; @@ -147,26 +150,37 @@ public class ChatRule { /** * checks every input option and if the games state and the inputted str matches them returns true. - * @param str the chat message to check if fits + * @param inputString the chat message to check if fits * @return if the inputs are all true and the outputs should be performed */ - public Boolean isMatch(String str, MinecraftClient client){ + public Boolean isMatch(String inputString){ //enabled if (!enabled) return false; + //ignore case + String testString; + String testFilter; + if (isIgnoreCase){ + testString = inputString.toLowerCase(); + testFilter = filter.toLowerCase(); + }else { + testString = inputString; + testFilter = filter; + } + //filter - if (filter.isEmpty()) return false; + if (testFilter.isEmpty()) return false; if(isRegex) { if (isPartialMatch) { - if (! Pattern.compile(filter).matcher(str).find()) return false; + if (! Pattern.compile(testFilter).matcher(testString).find()) return false; }else { - if (!str.matches(filter)) return false; + if (!testString.matches(testFilter)) return false; } } else{ if (isPartialMatch) { - if (!str.contains(filter)) return false; + if (!testString.contains(testFilter)) return false; }else { - if (!filter.equals(str)) return false; + if (!testFilter.equals(testString)) return false; } } 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 dc2ab0f1..f8823589 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java @@ -5,10 +5,12 @@ 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; import org.slf4j.LoggerFactory; @@ -25,6 +27,7 @@ import java.util.List; import java.util.Map; public class ChatRulesHandler { + private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); private static final Logger LOGGER = LoggerFactory.getLogger(ChatRule.class); private static final Path CHAT_RULE_FILE = SkyblockerMod.CONFIG_DIR.resolve("chatRules.json"); @@ -32,7 +35,7 @@ public class ChatRulesHandler { public static void init() { loadChatRules(); - ClientReceiveMessageEvents.GAME.register(ChatRulesHandler::checkMessage); + ClientReceiveMessageEvents.ALLOW_GAME.register(ChatRulesHandler::checkMessage); } private static void loadChatRules() { @@ -62,8 +65,45 @@ public class ChatRulesHandler { } } - private static void checkMessage(Text message, Boolean overlay) { + /** + * Checks each rule in {@link ChatRulesHandler#chatRuleList} to see if they are a match for the message and if so change outputs based on the options set in the {@link ChatRule}. + * @param message the chat message + * @param overlay if its overlay + */ + private static boolean checkMessage(Text message, Boolean overlay) { + if (!Utils.isOnSkyblock()) return true; //do not work not on skyblock + if (overlay) return true; //ignore messages in overlay + String plain = trimItemColor(message.getString()); + for (ChatRule rule : chatRuleList) { + if (rule.isMatch(plain)) { + //get a replacement message + Text newMessage; + if (!rule.getReplaceMessage().isEmpty()){ + newMessage = Text.of(rule.getReplaceMessage()); + } + else { + newMessage =message; + } + //todo show announcement + + //show in action bar + if (rule.getShowActionBar() && CLIENT.player != null) { + CLIENT.player.sendMessage(newMessage, true); + } + //hide message + if (!rule.getHideMessage() && CLIENT.player != null){ + CLIENT.player.sendMessage(newMessage, false); + } + //do not send original message + return false; + } + } + return true; + } + private static String trimItemColor(String str) { + if (str.isEmpty()) return str; + return str.replaceAll("ยง[0-9a-g]", ""); } } -- cgit From 3cdcc209a398694f212238b843e732fcd512c408 Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 15 Feb 2024 21:04:20 +0000 Subject: add config options for ignore case and valid locations implemented option to ignore the case of the message. and option to make it only work when raw location = value or != value. --- .../hysky/skyblocker/skyblock/chat/ChatRule.java | 91 ++++++++++++---------- .../skyblock/chat/ChatRuleConfigScreen.java | 74 ++++++++++++++---- .../resources/assets/skyblocker/lang/en_us.json | 2 + 3 files changed, 111 insertions(+), 56 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java index afc409ac..9643b413 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java @@ -1,12 +1,11 @@ package de.hysky.skyblocker.skyblock.chat; import de.hysky.skyblocker.utils.Utils; -import dev.isxander.yacl3.config.v2.api.SerialEntry; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.sound.Sound; import net.minecraft.item.ItemStack; import java.util.List; +import java.util.Objects; import java.util.regex.Pattern; /** @@ -14,22 +13,22 @@ import java.util.regex.Pattern; */ public class ChatRule { - public String name; + private String name; //inputs - public Boolean enabled; - public Boolean isPartialMatch; - public Boolean isRegex; - public Boolean isIgnoreCase; - public String filter; - public LocationOption validLocation; + private Boolean enabled; + private Boolean isPartialMatch; + private Boolean isRegex; + private Boolean isIgnoreCase; + private String filter; + private String validLocations; //output - public Boolean hideMessage; - public Boolean showActionBar; - public Boolean showAnnouncement; - public String replaceMessage; //todo extract parts of original message - public Sound customSound; + private Boolean hideMessage; + private Boolean showActionBar; + private Boolean showAnnouncement; + private String replaceMessage; //todo extract parts of original message + private Sound customSound; /** * Creates a chat rule with default options. */ @@ -41,7 +40,7 @@ public class ChatRule { this.isRegex = false; this.isIgnoreCase = true; this.filter = ""; - this.validLocation = LocationOption.None; + this.validLocations = ""; this.hideMessage = true; this.showActionBar = false; @@ -51,14 +50,14 @@ public class ChatRule { } - public ChatRule(String name, Boolean enabled, Boolean isPartialMatch, Boolean isRegex, Boolean isIgnoreCase, String filter, LocationOption validLocation, List validItems, Boolean hideMessage, Boolean showActionBar, Boolean showAnnouncement, String replaceMessage, Sound customSound) { + public ChatRule(String name, Boolean enabled, Boolean isPartialMatch, Boolean isRegex, Boolean isIgnoreCase, String filter, String validLocation, List validItems, Boolean hideMessage, Boolean showActionBar, Boolean showAnnouncement, String replaceMessage, Sound customSound) { this.name = name; this.enabled = enabled; this.isPartialMatch = isPartialMatch; this.isRegex = isRegex; this.isIgnoreCase = isIgnoreCase; this.filter = filter; - this.validLocation = validLocation; + this.validLocations = validLocation; this.hideMessage = hideMessage; this.showActionBar = showActionBar; this.showAnnouncement = showAnnouncement; @@ -90,24 +89,22 @@ public class ChatRule { isRegex = regex; } - public String getFilter() { - return filter; + public Boolean getIgnoreCase() { + return isIgnoreCase; } - public void setFilter(String filter) { - this.filter = filter; + public void setIgnoreCase(Boolean ignoreCase) { + isIgnoreCase = ignoreCase; } - public LocationOption getValidLocation() { - return validLocation; + public String getFilter() { + return filter; } - public void setValidLocation(LocationOption validLocation) { - this.validLocation = validLocation; + public void setFilter(String filter) { + this.filter = filter; } - - public Boolean getHideMessage() { return hideMessage; } @@ -148,6 +145,14 @@ public class ChatRule { this.customSound = customSound; } + public String getValidLocations() { + return validLocations; + } + + public void setValidLocations(String validLocations) { + this.validLocations = validLocations; + } + /** * checks every input option and if the games state and the inputted str matches them returns true. * @param inputString the chat message to check if fits @@ -185,22 +190,30 @@ public class ChatRule { } //location + if (validLocations.isEmpty()){ //if no locations do not check + return true; + } String rawLocation = Utils.getLocationRaw(); - switch (validLocation){ //todo maybe add functionality straight into utils - case Island -> { - if (!rawLocation.equals("private_island")) return false; - } - case Hub -> { - if (!rawLocation.equals("hub")) return false; - } - case Garden -> { - if (!rawLocation.equals("garden")) return false; - } - default -> {} + Boolean isLocationValid = null; + for (String validLocation : validLocations.replace(" ", "").split(",")) {//the locations are raw locations split by "," and start with ! if not locations + if (validLocation.startsWith("!")) {//not location ( + if (Objects.equals(validLocation.substring(1), rawLocation)) { + isLocationValid = false; + break; + } + }else { + if (Objects.equals(validLocation, rawLocation)) { //normal location + isLocationValid = true; + break; + } + } + } + if (isLocationValid == null || !isLocationValid){//if location is not in the list at all and is a not a "!" location or and is a normal location + return true; } - return true; + return false; } public String getName() { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java index 0dc912d2..e866520f 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java @@ -26,8 +26,8 @@ public class ChatRuleConfigScreen extends Screen { private TextFieldWidget filterInput; private ButtonWidget partialMatchToggle; private ButtonWidget regexToggle; - //todo location dropdown or somthig - //todo item selection thing + private ButtonWidget ignoreCaseToggle; + private TextFieldWidget locationsInput; private ButtonWidget hideMessageToggle; private ButtonWidget actionBarToggle; @@ -42,10 +42,9 @@ public class ChatRuleConfigScreen extends Screen { private IntIntPair filterLabelTextPos; private IntIntPair partialMatchTextPos; private IntIntPair regexTextPos; + private IntIntPair ignoreCaseTextPos; - private IntIntPair validLocationLabelTextPos; - - private IntIntPair validItemLabelTextPos; + private IntIntPair locationLabelTextPos; private IntIntPair outputsLabelTextPos; @@ -73,8 +72,8 @@ public class ChatRuleConfigScreen extends Screen { protected void init() { super.init(); if (client == null) return; - - IntIntPair currentPos = IntIntPair.of(5,15); + //start centered on the X and 1/3 down on the Y + IntIntPair currentPos = IntIntPair.of((this.width - getMaxUsedWidth()) / 2,(int)((this.height -getMaxUsedHeight()) * 0.33)); int lineXOffset = 0; nameLabelTextPos = currentPos; @@ -112,8 +111,23 @@ public class ChatRuleConfigScreen extends Screen { .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) .size(75,20) .build(); + lineXOffset += 75 + SPACER_X; + ignoreCaseTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt()); + lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase")) + SPACER_X; + ignoreCaseToggle = ButtonWidget.builder(enabledButtonText(chatRule.getIgnoreCase()), a -> { + chatRule.setIgnoreCase(!chatRule.getIgnoreCase()); + ignoreCaseToggle.setMessage(enabledButtonText(chatRule.getIgnoreCase())); + }) + .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt()) + .size(75,20) + .build(); currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); + locationLabelTextPos = currentPos; + lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations")) + SPACER_X; + locationsInput = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of("")); + locationsInput.setText(chatRule.getValidLocations()); + currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); outputsLabelTextPos = IntIntPair.of(currentPos.leftInt() - 10,currentPos.rightInt()); currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y); @@ -166,6 +180,8 @@ public class ChatRuleConfigScreen extends Screen { addDrawableChild(filterInput); addDrawableChild(partialMatchToggle); addDrawableChild(regexToggle); + addDrawableChild(ignoreCaseToggle); + addDrawableChild(locationsInput); addDrawableChild(hideMessageToggle); addDrawableChild(actionBarToggle); addDrawableChild(announcementToggle); @@ -173,6 +189,28 @@ public class ChatRuleConfigScreen extends Screen { addDrawableChild(finishButton); } + /** + * works out the width of the maximum line + * @return + */ + private int getMaxUsedWidth() { + if (client == null) return 0; + //text + int total = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")); + total += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex")); + total += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase")); + //space + total += SPACER_X * 6; + //button width + total += 75 * 3; + return total; + } + + private int getMaxUsedHeight() { + //there are 7 rows so just times the spacer by 7 + return SPACER_Y * 8; + } + private Text enabledButtonText(boolean enabled) { if (enabled){ return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.green.getRGB()); @@ -189,16 +227,17 @@ public class ChatRuleConfigScreen extends Screen { //draw labels ands text int yOffset = (SPACER_Y - this.textRenderer.fontHeight) / 2; context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt()+ yOffset, 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt()+ yOffset, 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt()+ yOffset, 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt()+ yOffset, 0xFFFFFF); - //context.drawTextWithShadow(this.textRenderer,"valid", validItemLabelTextPos.leftInt(), validItemLabelTextPos.rightInt(), 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt()+ yOffset, 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt()+ yOffset, 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt()+ yOffset, 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt()+ yOffset, 0xFFFFFF); - context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt()+ yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFF); + context.drawTextWithShadow(this.textRenderer,Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt() + yOffset, 0xFFFFFF); } @Override @@ -214,6 +253,7 @@ public class ChatRuleConfigScreen extends Screen { chatRule.setName(nameInput.getText()); chatRule.setFilter(filterInput.getText()); chatRule.setReplaceMessage(replaceMessageInput.getText()); + chatRule.setValidLocations(locationsInput.getText()); ChatRulesHandler.chatRuleList.set(chatRuleIndex,chatRule); } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 35759e3e..c8725dc8 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -365,6 +365,8 @@ "text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter": "ChatFilter:", "text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch": "Allow Partial Match:", "text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex": "Is Regex:", + "text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase": "Ignore Case:", + "text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations": "Valid Locations:", "text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.outputs": "Outputs:", "text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage": "Hide Message:", "text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar": "Show In Action Bar:", -- cgit