Skip to content

expressions highlighter #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RedVortexDev merged 13 commits into from
Oct 27, 2024
Merged

expressions highlighter #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
40bd24e
draft expression highlighter
sylviameows Oct 7, 2024
1df13ba
edit box and formatting
sylviameows Oct 8, 2024
fcddc0a
highlight minimessage tags properly in editbox
sylviameows Oct 14, 2024
6c3bf62
expression highlights
sylviameows Oct 14, 2024
200e414
highlighter config
sylviameows Oct 14, 2024
b062c56
small fixes
sylviameows Oct 14, 2024
0ee7f1f
complete todos
sylviameows Oct 14, 2024
501d253
remove comments in config
sylviameows Oct 14, 2024
13e5679
create consistency with other features
sylviameows Oct 14, 2024
b3c2360
Merge branch 'main' into feat/highlight-expressions
RedVortexDev Oct 15, 2024
e4829ed
fix leaking color codes
sylviameows Oct 20, 2024
571c914
Merge branch 'feat/highlight-expressions' of https://github.com/sylvi…
sylviameows Oct 20, 2024
1a622e4
drafted clearing decorations
sylviameows Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ dependencies {
modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}"
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"

// adventure api for minimessage parsing (see ExpressionHighlighter)
// implementation "net.kyori:adventure-api:4.16.0"
modImplementation include("net.kyori:adventure-platform-fabric:5.12.0")

implementation include("org.java-websocket:Java-WebSocket:1.5.3")
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/dfonline/codeclient/CodeClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import dev.dfonline.codeclient.config.KeyBinds;
import dev.dfonline.codeclient.dev.*;
import dev.dfonline.codeclient.dev.debug.Debug;
import dev.dfonline.codeclient.dev.highlighter.ExpressionHighlighter;
import dev.dfonline.codeclient.dev.menu.InsertOverlayFeature;
import dev.dfonline.codeclient.dev.menu.RecentValues;
import dev.dfonline.codeclient.dev.menu.SlotGhostManager;
Expand Down Expand Up @@ -187,6 +188,7 @@ private static void loadFeatures() {
feat(new ChatAutoEdit());
feat(new CPUDisplay());
feat(new MessageHiding());
feat(new ExpressionHighlighter());
}

/**
Expand Down
77 changes: 77 additions & 0 deletions src/main/java/dev/dfonline/codeclient/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ public class Config {
public boolean CPUDisplay = true;
public CPUDisplayCorner CPUDisplayCornerOption = CPUDisplayCorner.TOP_LEFT;
public boolean HideScopeChangeMessages = true;
public boolean HighlighterEnabled = true;
public boolean HighlightExpressions = true;
public boolean HighlightMiniMessage = true;
public int MiniMessageTagColor = 0x808080;

public Config() {
}
Expand Down Expand Up @@ -163,6 +167,12 @@ public void save() {
object.addProperty("CPUDisplay", CPUDisplay);
object.addProperty("CPUDisplayCorner", CPUDisplayCornerOption.name());
object.addProperty("HideScopeChangeMessages", HideScopeChangeMessages);

object.addProperty("HighlighterEnabled", HighlighterEnabled);
object.addProperty("HighlightExpressions", HighlightExpressions);
object.addProperty("HighlightMiniMessage", HighlightMiniMessage);
object.addProperty("MiniMessageTagColor", MiniMessageTagColor);

FileManager.writeConfig(object.toString());
} catch (Exception e) {
CodeClient.LOGGER.info("Couldn't save config: " + e);
Expand Down Expand Up @@ -755,6 +765,73 @@ public YetAnotherConfigLib getLibConfig() {
.build())
.build())
//</editor-fold>
//<editor-fold desc="Chat Highlighter">
.group(OptionGroup.createBuilder()
.name(Text.translatable("codeclient.config.chat_highlighter"))
.description(OptionDescription.of(
Text.translatable("codeclient.config.chat_highlighter.description"),
Text.translatable("codeclient.config.chat_highlighter.description.extra")
))
.option(Option.createBuilder(Boolean.class)
.name(Text.translatable("codeclient.config.chat_highlighter.enable"))
.description(OptionDescription.of(
Text.translatable("codeclient.config.chat_highlighter.enable.description"),
Text.empty(),
Text.translatable("codeclient.config.chat_highlighter.description").setStyle(Style.EMPTY.withColor(Formatting.GRAY)),
Text.translatable("codeclient.config.chat_highlighter.description.extra").setStyle(Style.EMPTY.withColor(Formatting.GRAY))
))
.binding(
true,
() -> HighlighterEnabled,
opt -> HighlighterEnabled = opt
)
.controller(TickBoxControllerBuilder::create)
.build()
)
.option(Option.createBuilder(Boolean.class)
.name(Text.translatable("codeclient.config.chat_highlighter.with_expressions"))
.description(OptionDescription.of(
Text.translatable("codeclient.config.chat_highlighter.with_expressions.description"),
Text.translatable("codeclient.config.chat_highlighter.with_expressions.description.example")
))
.binding(
true,
() -> HighlightExpressions,
opt -> HighlightExpressions = opt
)
.controller(TickBoxControllerBuilder::create)
.build()
)
.option(Option.createBuilder(Boolean.class)
.name(Text.translatable("codeclient.config.chat_highlighter.with_minimessage"))
.description(OptionDescription.of(
Text.translatable("codeclient.config.chat_highlighter.with_minimessage.description1"),
Text.translatable("codeclient.config.chat_highlighter.with_minimessage.description2")
))
.binding(
true,
() -> HighlightMiniMessage,
opt -> HighlightMiniMessage = opt
)
.controller(TickBoxControllerBuilder::create)
.build()
)
.option(Option.createBuilder(Color.class)
.name(Text.translatable("codeclient.config.chat_highlighter.minimessage_tag_color"))
.description(OptionDescription.of(
Text.translatable("codeclient.config.chat_highlighter.minimessage_tag_color.description")
))
.binding(
new Color((float) 128 / 255, (float) 128 / 255, (float) 128 / 255),
() -> new Color(MiniMessageTagColor),
opt -> MiniMessageTagColor = opt.getRGB()
)
.controller(ColorControllerBuilder::create)
.build()
)
.build()
)
//</editor-fold>
//<editor-fold desc="Chest Highlight">
.group(OptionGroup.createBuilder()
.name(Text.translatable("codeclient.config.chest_highlight"))
Expand Down
Loading