-
-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #560 from olim88/chat-rules
Custom Chat Rules
- Loading branch information
Showing
12 changed files
with
1,272 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
264 changes: 264 additions & 0 deletions
264
src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,264 @@ | ||
| package de.hysky.skyblocker.skyblock.chat; | ||
|
|
||
| import de.hysky.skyblocker.utils.Utils; | ||
| import net.minecraft.sound.SoundEvent; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import com.mojang.serialization.Codec; | ||
| import com.mojang.serialization.codecs.RecordCodecBuilder; | ||
|
|
||
| /** | ||
| * Data class to contain all the settings for a chat rule | ||
| */ | ||
| public class ChatRule { | ||
| private static final Codec<ChatRule> CODEC = RecordCodecBuilder.create(instance -> instance.group( | ||
| Codec.STRING.fieldOf("name").forGetter(ChatRule::getName), | ||
| Codec.BOOL.fieldOf("enabled").forGetter(ChatRule::getEnabled), | ||
| Codec.BOOL.fieldOf("isPartialMatch").forGetter(ChatRule::getPartialMatch), | ||
| Codec.BOOL.fieldOf("isRegex").forGetter(ChatRule::getRegex), | ||
| Codec.BOOL.fieldOf("isIgnoreCase").forGetter(ChatRule::getIgnoreCase), | ||
| Codec.STRING.fieldOf("filter").forGetter(ChatRule::getFilter), | ||
| Codec.STRING.fieldOf("validLocations").forGetter(ChatRule::getValidLocations), | ||
| Codec.BOOL.fieldOf("hideMessage").forGetter(ChatRule::getHideMessage), | ||
| Codec.BOOL.fieldOf("showActionBar").forGetter(ChatRule::getShowActionBar), | ||
| Codec.BOOL.fieldOf("showAnnouncement").forGetter(ChatRule::getShowAnnouncement), | ||
| Codec.STRING.optionalFieldOf("replaceMessage").forGetter(ChatRule::getReplaceMessageOpt), | ||
| SoundEvent.CODEC.optionalFieldOf("customSound").forGetter(ChatRule::getCustomSoundOpt)) | ||
| .apply(instance, ChatRule::new)); | ||
| public static final Codec<List<ChatRule>> LIST_CODEC = CODEC.listOf(); | ||
|
|
||
| private String name; | ||
|
|
||
| //inputs | ||
| private Boolean enabled; | ||
| private Boolean isPartialMatch; | ||
| private Boolean isRegex; | ||
| private Boolean isIgnoreCase; | ||
| private String filter; | ||
| private String validLocations; | ||
|
|
||
| //output | ||
| private Boolean hideMessage; | ||
| private Boolean showActionBar; | ||
| private Boolean showAnnouncement; | ||
| private String replaceMessage; | ||
| private SoundEvent customSound; | ||
| /** | ||
| * Creates a chat rule with default options. | ||
| */ | ||
| protected ChatRule() { | ||
| this.name = "New Rule"; | ||
|
|
||
| this.enabled = true; | ||
| this.isPartialMatch = false; | ||
| this.isRegex = false; | ||
| this.isIgnoreCase = true; | ||
| this.filter = ""; | ||
| this.validLocations = ""; | ||
|
|
||
| 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, Boolean isIgnoreCase, String filter, String validLocations, Boolean hideMessage, Boolean showActionBar, Boolean showAnnouncement, String replaceMessage, SoundEvent customSound) { | ||
| this.name = name; | ||
| this.enabled = enabled; | ||
| this.isPartialMatch = isPartialMatch; | ||
| this.isRegex = isRegex; | ||
| this.isIgnoreCase = isIgnoreCase; | ||
| this.filter = filter; | ||
| this.validLocations = validLocations; | ||
| this.hideMessage = hideMessage; | ||
| this.showActionBar = showActionBar; | ||
| this.showAnnouncement = showAnnouncement; | ||
| this.replaceMessage = replaceMessage; | ||
| this.customSound = customSound; | ||
| } | ||
|
|
||
| private ChatRule(String name, Boolean enabled, Boolean isPartialMatch, Boolean isRegex, Boolean isIgnoreCase, String filter, String validLocations, Boolean hideMessage, Boolean showActionBar, Boolean showAnnouncement, Optional<String> replaceMessage, Optional<SoundEvent> customSound) { | ||
| this(name, enabled, isPartialMatch, isRegex, isIgnoreCase, filter, validLocations, hideMessage, showActionBar, showAnnouncement, replaceMessage.orElse(null), customSound.orElse(null)); | ||
| } | ||
|
|
||
| protected String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| protected void setName(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| protected Boolean getEnabled() { | ||
| return enabled; | ||
| } | ||
|
|
||
| protected void setEnabled(Boolean enabled) { | ||
| this.enabled = enabled; | ||
| } | ||
|
|
||
| protected Boolean getPartialMatch() { | ||
| return isPartialMatch; | ||
| } | ||
|
|
||
| protected void setPartialMatch(Boolean partialMatch) { | ||
| isPartialMatch = partialMatch; | ||
| } | ||
|
|
||
| protected Boolean getRegex() { | ||
| return isRegex; | ||
| } | ||
|
|
||
| protected void setRegex(Boolean regex) { | ||
| isRegex = regex; | ||
| } | ||
|
|
||
| protected Boolean getIgnoreCase() { | ||
| return isIgnoreCase; | ||
| } | ||
|
|
||
| protected void setIgnoreCase(Boolean ignoreCase) { | ||
| isIgnoreCase = ignoreCase; | ||
| } | ||
|
|
||
| protected String getFilter() { | ||
| return filter; | ||
| } | ||
|
|
||
| protected void setFilter(String filter) { | ||
| this.filter = filter; | ||
| } | ||
|
|
||
| protected Boolean getHideMessage() { | ||
| return hideMessage; | ||
| } | ||
|
|
||
| protected void setHideMessage(Boolean hideMessage) { | ||
| this.hideMessage = hideMessage; | ||
| } | ||
|
|
||
| protected Boolean getShowActionBar() { | ||
| return showActionBar; | ||
| } | ||
|
|
||
| protected void setShowActionBar(Boolean showActionBar) { | ||
| this.showActionBar = showActionBar; | ||
| } | ||
|
|
||
| protected Boolean getShowAnnouncement() { | ||
| return showAnnouncement; | ||
| } | ||
|
|
||
| protected void setShowAnnouncement(Boolean showAnnouncement) { | ||
| this.showAnnouncement = showAnnouncement; | ||
| } | ||
|
|
||
| protected String getReplaceMessage() { | ||
| return replaceMessage; | ||
| } | ||
|
|
||
| private Optional<String> getReplaceMessageOpt() { | ||
| return replaceMessage == null ? Optional.empty() : Optional.of(replaceMessage); | ||
| } | ||
|
|
||
| protected void setReplaceMessage(String replaceMessage) { | ||
| this.replaceMessage = replaceMessage; | ||
| } | ||
|
|
||
| protected SoundEvent getCustomSound() { | ||
| return customSound; | ||
| } | ||
|
|
||
| private Optional<SoundEvent> getCustomSoundOpt() { | ||
| return customSound == null ? Optional.empty() : Optional.of(customSound); | ||
| } | ||
|
|
||
| protected void setCustomSound(SoundEvent customSound) { | ||
| this.customSound = customSound; | ||
| } | ||
|
|
||
| protected String getValidLocations() { | ||
| return validLocations; | ||
| } | ||
|
|
||
| protected 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 | ||
| * @return if the inputs are all true and the outputs should be performed | ||
| */ | ||
| protected 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 (testFilter.isBlank()) return false; | ||
| if (isRegex) { | ||
| if (isPartialMatch) { | ||
| if (!Pattern.compile(testFilter).matcher(testString).find()) return false; | ||
| } else { | ||
| if (!testString.matches(testFilter)) return false; | ||
| } | ||
| } else { | ||
| if (isPartialMatch) { | ||
| if (!testString.contains(testFilter)) return false; | ||
| } else { | ||
| if (!testFilter.equals(testString)) return false; | ||
| } | ||
| } | ||
|
|
||
| //location | ||
| if (validLocations.isBlank()) { //if no locations do not check | ||
| return true; | ||
| } | ||
|
|
||
| String rawLocation = Utils.getLocationRaw(); | ||
| Boolean isLocationValid = null; | ||
|
|
||
| for (String validLocation : validLocations.replace(" ", "").toLowerCase().split(",")) {//the locations are raw locations split by "," and start with ! if not locations | ||
| String rawValidLocation = ChatRulesHandler.locations.get(validLocation.replace("!","")); | ||
| if (rawValidLocation == null) continue; | ||
| if (validLocation.startsWith("!")) {//not location | ||
| if (Objects.equals(rawValidLocation, rawLocation.toLowerCase())) { | ||
| isLocationValid = false; | ||
| break; | ||
| } | ||
| } else { | ||
| if (Objects.equals(rawValidLocation, rawLocation.toLowerCase())) { //normal location | ||
| isLocationValid = true; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| //if location is not in the list at all and is a not a "!" location or and is a normal location | ||
| if (isLocationValid != null && isLocationValid) { | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
48 changes: 48 additions & 0 deletions
48
src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package de.hysky.skyblocker.skyblock.chat; | ||
|
|
||
| import de.hysky.skyblocker.config.SkyblockerConfigManager; | ||
| import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; | ||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.client.gui.DrawContext; | ||
| import net.minecraft.client.util.math.MatrixStack; | ||
| import net.minecraft.text.Text; | ||
|
|
||
| public class ChatRuleAnnouncementScreen { | ||
| private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); | ||
| private static float timer; | ||
| private static Text text = null; | ||
|
|
||
| public static void init() { | ||
| HudRenderCallback.EVENT.register((context, tickDelta) -> { | ||
| if (timer <= 0 || text == null) { | ||
| return; | ||
| } | ||
| render(context, tickDelta); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * renders {@link ChatRuleAnnouncementScreen#text} to the middle of the top of the screen. | ||
| * @param context render context | ||
| * @param tickDelta difference from last render to remove from timer | ||
| */ | ||
| private static void render(DrawContext context, float tickDelta) { | ||
| int scale = SkyblockerConfigManager.get().messages.chatRuleConfig.announcementScale; | ||
| //decrement timer | ||
| timer -= tickDelta; | ||
| //scale text up and center | ||
| MatrixStack matrices = context.getMatrices(); | ||
| matrices.push(); | ||
| matrices.translate(context.getScaledWindowWidth() / 2f, context.getScaledWindowHeight() * 0.3, 0f); | ||
| matrices.scale(scale, scale, 0f); | ||
| //render text | ||
| context.drawCenteredTextWithShadow(CLIENT.textRenderer, text, 0, 0, 0xFFFFFFFF); | ||
|
|
||
| matrices.pop(); | ||
| } | ||
|
|
||
| protected static void setText(Text newText) { | ||
| text = newText; | ||
| timer = SkyblockerConfigManager.get().messages.chatRuleConfig.announcementLength; | ||
| } | ||
| } |
Oops, something went wrong.