Skip to content

Commit

Permalink
Add an error indicator for condition patterns
Browse files Browse the repository at this point in the history
  • Loading branch information
@NotRyken
NotRyken committed Jul 19, 2024
1 parent 267051e commit fa2f508
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 23 deletions.
2 changes: 1 addition & 1 deletion changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- Safe check condition patterns
- Add an error indicator for condition patterns
11 changes: 11 additions & 0 deletions common/src/main/java/dev/terminalmc/autoreconnectrf/AutoReconnect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@
import net.minecraft.network.chat.contents.TranslatableContents;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.IntConsumer;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;

public class AutoReconnect {
public static final String MOD_ID = "autoreconnectrf";
Expand Down Expand Up @@ -102,6 +105,8 @@ public class AutoReconnect {
"multiplayer.requiredTexturePrompt.disconnect"
);

public static final List<Pattern> conditionPatterns = new ArrayList<>();

public static @Nullable String lastDcReasonStr = null;
public static @Nullable String lastDcReasonKey = null;

Expand All @@ -113,6 +118,12 @@ public static void onEndTick(Minecraft mc) {
}

public static void onConfigSaved(Config config) {
conditionPatterns.clear();
for (String s : config.options.conditionPatterns) {
try {
conditionPatterns.add(Pattern.compile(s));
} catch (PatternSyntaxException ignored) {}
}
}

// Legacy
Expand Down
139 changes: 130 additions & 9 deletions common/src/main/java/dev/terminalmc/autoreconnectrf/gui/screen/YaclScreenProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,30 @@
package dev.terminalmc.autoreconnectrf.gui.screen;

import dev.isxander.yacl3.api.*;
import dev.isxander.yacl3.api.controller.BooleanControllerBuilder;
import dev.isxander.yacl3.api.controller.DropdownStringControllerBuilder;
import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
import dev.isxander.yacl3.api.controller.StringControllerBuilder;
import dev.isxander.yacl3.api.controller.*;
import dev.isxander.yacl3.api.utils.Dimension;
import dev.isxander.yacl3.gui.AbstractWidget;
import dev.isxander.yacl3.gui.YACLScreen;
import dev.isxander.yacl3.gui.controllers.string.IStringController;
import dev.isxander.yacl3.gui.controllers.string.StringController;
import dev.isxander.yacl3.gui.controllers.string.StringControllerElement;
import dev.terminalmc.autoreconnectrf.AutoReconnect;
import dev.terminalmc.autoreconnectrf.config.Config;
import dev.terminalmc.autoreconnectrf.mixin.accessor.YACLScreenAccessor;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Tooltip;
import net.minecraft.client.gui.components.WidgetTooltipHolder;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Optional;
import java.util.function.Function;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;

import static dev.terminalmc.autoreconnectrf.util.Localization.localized;

Expand Down Expand Up @@ -54,7 +67,7 @@ static Screen getConfigScreen(Screen parent) {
.binding(Config.Options.defaultDelays,
() -> options.delays,
val -> options.delays = val)
.controller(val -> IntegerFieldControllerBuilder.create(val).min(1))
.controller(option -> IntegerFieldControllerBuilder.create(option).min(1))
.initial(0)
.insertEntriesAtEnd(true)
.minimumNumberOfEntries(1)
Expand Down Expand Up @@ -86,7 +99,7 @@ static Screen getConfigScreen(Screen parent) {
.binding(Config.Options.defaultConditionType,
() -> options.conditionType,
val -> options.conditionType = val)
.controller(val -> BooleanControllerBuilder.create(val)
.controller(option -> BooleanControllerBuilder.create(option)
.formatValue(val2 -> val2
? localized("option", "conditions.type.positive")
: localized("option", "conditions.type.negative"))
Expand All @@ -102,7 +115,7 @@ static Screen getConfigScreen(Screen parent) {
.binding(Config.Options.defaultConditionKeys,
() -> options.conditionKeys,
val -> options.conditionKeys = val)
.controller(val -> DropdownStringControllerBuilder.create(val)
.controller(option -> DropdownStringControllerBuilder.create(option)
.values(AutoReconnect.DISCONNECT_KEYS)
.allowAnyValue(true)
.allowEmptyValue(false))
Expand All @@ -119,7 +132,16 @@ static Screen getConfigScreen(Screen parent) {
.binding(Config.Options.defaultConditionPatterns,
() -> options.conditionPatterns,
val -> options.conditionPatterns = val)
.controller(StringControllerBuilder::create)
.controller(option -> IRestrictedStringControllerBuilder
.create(option)
.validator(val -> {
try {
Pattern.compile(val);
return Optional.empty();
} catch (PatternSyntaxException e) {
return Optional.of(e.getMessage().replaceAll("\\u000D", ""));
}
}))
.initial("")
.insertEntriesAtEnd(true)
.build());
Expand Down Expand Up @@ -163,7 +185,7 @@ static Screen getConfigScreen(Screen parent) {
.binding(Config.AutoMessage.defaultDelay,
() -> am.delay,
val -> am.delay = val)
.controller(val -> IntegerFieldControllerBuilder.create(val).min(0))
.controller(option -> IntegerFieldControllerBuilder.create(option).min(0))
.build());

messagesCat.group(amGroup.build());
Expand Down Expand Up @@ -214,4 +236,103 @@ public static void reload(YACLScreen screen) {
tab, newScreen.tabNavigationBar.getTabs().size() - 1);
}
}

// Various shenanigans to implement a custom string option validator, of sorts
// If you're overly concerned about code quality, turn back now

public interface IRestrictedStringControllerBuilder extends ControllerBuilder<String> {
static IRestrictedStringControllerBuilder create(Option<String> option) {
return new RestrictedStringControllerBuilder(option);
}

IRestrictedStringControllerBuilder validator(Function<String, Optional<String>> validator);
}

public static abstract class CustomAbstractControllerBuilder<T> implements ControllerBuilder<T> {
protected final Option<T> option;
protected CustomAbstractControllerBuilder(Option<T> option) {
this.option = option;
}
}

public static class RestrictedStringControllerBuilder extends CustomAbstractControllerBuilder<String>
implements IRestrictedStringControllerBuilder {
private Function<String, Optional<String>> validator;

public RestrictedStringControllerBuilder(Option<String> option) {
super(option);
}

public RestrictedStringControllerBuilder validator(Function<String, Optional<String>> validator) {
this.validator = validator;
return this;
}

public Controller<String> build() {
return new RestrictedStringController(this.option, validator);
}
}

private static class RestrictedStringController extends StringController {
private final @Nullable Function<String, Optional<String>> validator;
private @Nullable String displayValue;
private @Nullable YaclScreenProvider.RestrictedStringControllerElement widget;

public RestrictedStringController(Option<String> option,
@Nullable Function<String, Optional<String>> validator) {
super(option);
this.validator = validator;
}

@Override
public Component formatValue() {
if (displayValue == null) {
return super.formatValue();
} else {
return Component.literal(displayValue).withStyle(ChatFormatting.RED);
}
}

@Override
public void setFromString(String value) {
if (validator != null) {
Optional<String> error = validator.apply(value);
if (error.isPresent()) {
displayValue = value;
if (widget != null) {
widget.setTooltip(Tooltip.create(Component.literal(error.get())));
}
return;
}
}
displayValue = null;
if (widget != null) widget.setTooltip(null);
super.setFromString(value);
}

@Override
public AbstractWidget provideWidget(YACLScreen screen, Dimension<Integer> widgetDimension) {
widget = new RestrictedStringControllerElement(this, screen, widgetDimension, true);
return widget;
}
}

private static class RestrictedStringControllerElement extends StringControllerElement {
private final WidgetTooltipHolder tooltip = new WidgetTooltipHolder();

public RestrictedStringControllerElement(IStringController<?> control, YACLScreen screen, Dimension<Integer> dim, boolean instantApply) {
super(control, screen, dim, instantApply);
}

public void setTooltip(@Nullable Tooltip tooltip) {
this.tooltip.set(tooltip);
}

@Override
public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float delta) {
super.render(graphics, mouseX, mouseY, delta);
this.tooltip.refreshTooltipForNextRenderPass(super.isMouseOver(mouseX, mouseY),
super.isFocused(), super.getRectangle());
}
}
}
18 changes: 6 additions & 12 deletions common/src/main/java/dev/terminalmc/autoreconnectrf/mixin/MixinDisconnectedScreens.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.NoSuchElementException;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;

import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
Expand Down Expand Up @@ -64,17 +63,12 @@ private void init(CallbackInfo info) {
AutoReconnect.lastDcReasonKey = null;
boolean match = false;

for (String condition : Config.get().options.conditionPatterns) {
try {
if (Pattern.compile(condition).matcher(reasonStr).find()) {
AutoReconnect.LOG.info("Matched pattern '{}' against reason '{}'",
condition, reasonStr);
match = true;
break;
}
} catch (PatternSyntaxException e) {
AutoReconnect.LOG.error(String.format("Invalid pattern: %s\n%s", condition,
e.getMessage()));
for (Pattern condition : AutoReconnect.conditionPatterns) {
if (condition.matcher(reasonStr).find()) {
AutoReconnect.LOG.info("Matched pattern '{}' against reason '{}'",
condition, reasonStr);
match = true;
break;
}
}
if (!match && reason.getContents() instanceof TranslatableContents tc) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html

# Project
mod_version=0.3.0
mod_version=0.4.0
mod_group=dev.terminalmc
mod_id=autoreconnectrf
mod_name=AutoReconnect-Reforged
Expand Down

0 comments on commit fa2f508

Please sign in to comment.