Skip to content

Commit 26b4f9e

Browse files
NotRykenNotRyken
committed
Minor improvements
1 parent f218e7a commit 26b4f9e

11 files changed

Lines changed: 121 additions & 124 deletions

File tree

‎changelog.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Add unrecognized message feedback
1+
- Minor improvements

‎common/src/main/java/dev/terminalmc/claimpoints/ClaimPoints.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import dev.terminalmc.claimpoints.config.Config;
2020
import dev.terminalmc.claimpoints.util.ModLogger;
21-
import dev.terminalmc.claimpoints.chat.ChatScanner;
21+
import dev.terminalmc.claimpoints.util.ChatScanner;
2222
import dev.terminalmc.claimpoints.xaero.WaypointManager;
2323
import net.minecraft.ChatFormatting;
2424
import net.minecraft.client.Minecraft;

‎common/src/main/java/dev/terminalmc/claimpoints/command/Commands.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
2323
import dev.terminalmc.claimpoints.ClaimPoints;
2424
import dev.terminalmc.claimpoints.config.Config;
25-
import dev.terminalmc.claimpoints.chat.ChatScanner;
25+
import dev.terminalmc.claimpoints.util.ChatScanner;
2626
import net.minecraft.ChatFormatting;
2727
import net.minecraft.client.Minecraft;
2828
import net.minecraft.client.multiplayer.ClientPacketListener;
@@ -148,18 +148,18 @@ private static int getWorlds() {
148148
}
149149

150150
private static int addFrom(String world) {
151-
return scanFrom(world, ChatScanner.ClaimScanType.ADD);
151+
return scanFrom(world, ChatScanner.ScanType.ADD);
152152
}
153153

154154
private static int cleanFrom(String world) {
155-
return scanFrom(world, ChatScanner.ClaimScanType.CLEAN);
155+
return scanFrom(world, ChatScanner.ScanType.CLEAN);
156156
}
157157

158158
private static int updateFrom(String world) {
159-
return scanFrom(world, ChatScanner.ClaimScanType.UPDATE);
159+
return scanFrom(world, ChatScanner.ScanType.UPDATE);
160160
}
161161

162-
private static int scanFrom(String world, ChatScanner.ClaimScanType scanType) {
162+
private static int scanFrom(String world, ChatScanner.ScanType scanType) {
163163
ClientPacketListener connection = Minecraft.getInstance().getConnection();
164164
if (connection != null) {
165165
connection.sendCommand(Config.get().gpSettings.claimListCommand);

‎common/src/main/java/dev/terminalmc/claimpoints/config/Config.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,45 +43,45 @@ public class Config {
4343
public final GriefPreventionSettings gpSettings = new GriefPreventionSettings();
4444

4545
public static class ClaimPointSettings {
46-
public static final String defaultNameFormat = "CP (%d)";
47-
public String nameFormat = defaultNameFormat;
46+
public static final String nameFormatDefault = "CP (%d)";
47+
public String nameFormat = nameFormatDefault;
4848

4949
public static final String defaultNamePattern = "^CP \\((\\d+)\\)$";
5050
public String namePattern = defaultNamePattern;
5151
public transient Pattern nameCompiled;
5252

53-
public static final String defaultAlias = "C";
54-
public String alias = defaultAlias;
53+
public static final String aliasDefault = "C";
54+
public String alias = aliasDefault;
5555

56-
public static final String defaultColor = ClaimPoints.waypointColorNames.getLast();
57-
public String color = defaultColor;
56+
public static final String colorDefault = ClaimPoints.waypointColorNames.getLast();
57+
public String color = colorDefault;
5858
public transient int colorIdx;
5959
}
6060

6161
public static class GriefPreventionSettings {
62-
public static final String defaultClaimListCommand = "claimlist";
63-
public String claimListCommand = defaultClaimListCommand;
62+
public static final String claimListCommandDefault = "claimlist";
63+
public String claimListCommand = claimListCommandDefault;
6464

65-
public static final String defaultFirstLinePattern =
65+
public static final String firstLinePatternDefault =
6666
"^-?\\d+ blocks from play \\+ -?\\d+ bonus = -?\\d+ total\\.$";
67-
public String firstLinePattern = defaultFirstLinePattern;
67+
public String firstLinePattern = firstLinePatternDefault;
6868
public transient Pattern firstLineCompiled;
6969

70-
public static final String defaultClaimLinePattern =
70+
public static final String claimLinePatternDefault =
7171
"^(.+): x(-?\\d+), z(-?\\d+) \\(-?(\\d+) blocks\\)$";
72-
public String claimLinePattern = defaultClaimLinePattern;
72+
public String claimLinePattern = claimLinePatternDefault;
7373
public transient Pattern claimLineCompiled;
7474

75-
public static final List<String> defaultIgnoredLinePatterns = List.of(
75+
public static final List<String> ignoredLinePatternsDefault = List.of(
7676
"^Claims:$"
7777
);
78-
public List<String> ignoredLinePatterns = new ArrayList<>(defaultIgnoredLinePatterns);
78+
public List<String> ignoredLinePatterns = new ArrayList<>(ignoredLinePatternsDefault);
7979
public transient List<Pattern> ignoredLinesCompiled;
8080

81-
public static final List<String> defaultEndingLinePatterns = List.of(
81+
public static final List<String> endingLinePatternsDefault = List.of(
8282
"^ = -?\\d* blocks left to spend$"
8383
);
84-
public List<String> endingLinePatterns = new ArrayList<>(defaultEndingLinePatterns);
84+
public List<String> endingLinePatterns = new ArrayList<>(endingLinePatternsDefault);
8585
public transient List<Pattern> endingLinesCompiled;
8686
}
8787

‎common/src/main/java/dev/terminalmc/claimpoints/gui/screen/ClothScreenProvider.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import dev.terminalmc.claimpoints.config.Config;
2121
import me.shedaniel.clothconfig2.api.*;
2222
import net.minecraft.client.gui.screens.Screen;
23-
import net.minecraft.network.chat.Component;
2423

2524
import java.util.Optional;
2625

@@ -39,7 +38,7 @@ static Screen getConfigScreen(Screen parent) {
3938

4039
ConfigBuilder builder = ConfigBuilder.create()
4140
.setParentScreen(parent)
42-
.setTitle(Component.literal("ClaimPoints Settings"))
41+
.setTitle(localized("name"))
4342
.setSavingRunnable(() -> {
4443
try {
4544
Config.get().verify();
@@ -56,17 +55,17 @@ static Screen getConfigScreen(Screen parent) {
5655
ConfigCategory cp = builder.getOrCreateCategory(localized(
5756
"option", "waypoints"));
5857

59-
cp.addEntry(eb.startStrField(localized("option", "name_format"), config.cpSettings.nameFormat)
60-
.setDefaultValue(Config.ClaimPointSettings.defaultNameFormat)
58+
cp.addEntry(eb.startStrField(localized("option", "nameFormat"), config.cpSettings.nameFormat)
59+
.setDefaultValue(Config.ClaimPointSettings.nameFormatDefault)
6160
.setErrorSupplier(val -> {
6261
if (val.contains("%d")) return Optional.empty();
63-
else return Optional.of(localized("option", "name_format.error"));
62+
else return Optional.of(localized("option", "nameFormat.error"));
6463
})
6564
.setSaveConsumer(var -> config.cpSettings.nameFormat = var)
6665
.build());
6766

6867
cp.addEntry(eb.startStrField(localized("option", "alias"), config.cpSettings.alias)
69-
.setDefaultValue(Config.ClaimPointSettings.defaultAlias)
68+
.setDefaultValue(Config.ClaimPointSettings.aliasDefault)
7069
.setErrorSupplier(val -> {
7170
if (!val.isEmpty() && val.length() < 3) return Optional.empty();
7271
else return Optional.of(localized("option", "alias.error"));
@@ -78,7 +77,7 @@ static Screen getConfigScreen(Screen parent) {
7877
config.cpSettings.color, String::valueOf)
7978
.setSuggestionMode(false)
8079
.setSelections(ClaimPoints.waypointColorNames)
81-
.setDefaultValue(Config.ClaimPointSettings.defaultColor)
80+
.setDefaultValue(Config.ClaimPointSettings.colorDefault)
8281
.setSaveConsumer(var -> config.cpSettings.color = var)
8382
.build());
8483

@@ -88,31 +87,31 @@ static Screen getConfigScreen(Screen parent) {
8887

8988
gp.addEntry(eb.startStrField(localized("option", "command"),
9089
config.gpSettings.claimListCommand)
91-
.setDefaultValue(Config.GriefPreventionSettings.defaultClaimListCommand)
90+
.setDefaultValue(Config.GriefPreventionSettings.claimListCommandDefault)
9291
.setSaveConsumer(var -> config.gpSettings.claimListCommand = var)
9392
.build());
9493

95-
gp.addEntry(eb.startStrField(localized("option", "first_pattern"),
94+
gp.addEntry(eb.startStrField(localized("option", "firstPattern"),
9695
config.gpSettings.firstLinePattern)
97-
.setDefaultValue(Config.GriefPreventionSettings.defaultFirstLinePattern)
96+
.setDefaultValue(Config.GriefPreventionSettings.firstLinePatternDefault)
9897
.setSaveConsumer(var -> config.gpSettings.firstLinePattern = var)
9998
.build());
10099

101-
gp.addEntry(eb.startStrField(localized("option", "claim_pattern"),
100+
gp.addEntry(eb.startStrField(localized("option", "claimPattern"),
102101
config.gpSettings.claimLinePattern)
103-
.setDefaultValue(Config.GriefPreventionSettings.defaultClaimLinePattern)
102+
.setDefaultValue(Config.GriefPreventionSettings.claimLinePatternDefault)
104103
.setSaveConsumer(var -> config.gpSettings.claimLinePattern = var)
105104
.build());
106105

107-
gp.addEntry(eb.startStrList(localized("option", "ignored_pattern"),
106+
gp.addEntry(eb.startStrList(localized("option", "ignoredPattern"),
108107
config.gpSettings.ignoredLinePatterns)
109-
.setDefaultValue(Config.GriefPreventionSettings.defaultIgnoredLinePatterns)
108+
.setDefaultValue(Config.GriefPreventionSettings.ignoredLinePatternsDefault)
110109
.setSaveConsumer(var -> config.gpSettings.ignoredLinePatterns = var)
111110
.build());
112111

113-
gp.addEntry(eb.startStrList(localized("option", "ending_pattern"),
112+
gp.addEntry(eb.startStrList(localized("option", "endingPattern"),
114113
config.gpSettings.endingLinePatterns)
115-
.setDefaultValue(Config.GriefPreventionSettings.defaultEndingLinePatterns)
114+
.setDefaultValue(Config.GriefPreventionSettings.endingLinePatternsDefault)
116115
.setSaveConsumer(var -> config.gpSettings.endingLinePatterns = var)
117116
.build());
118117

‎common/src/main/java/dev/terminalmc/claimpoints/gui/screen/ConfigScreenProvider.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,53 +17,57 @@
1717
package dev.terminalmc.claimpoints.gui.screen;
1818

1919
import net.minecraft.Util;
20-
import net.minecraft.client.Minecraft;
2120
import net.minecraft.client.gui.components.Button;
2221
import net.minecraft.client.gui.components.MultiLineTextWidget;
2322
import net.minecraft.client.gui.screens.ConfirmLinkScreen;
24-
import net.minecraft.client.gui.screens.options.OptionsSubScreen;
2523
import net.minecraft.client.gui.screens.Screen;
2624
import net.minecraft.network.chat.CommonComponents;
2725

2826
import static dev.terminalmc.claimpoints.util.Localization.localized;
2927

3028
/**
31-
* <p>Wraps {@link ClothScreenProvider} and provides a backup screen for
32-
* use when the Cloth Config mod is not loaded. This allows the dependency on
33-
* Cloth Config to be defined as optional.</p>
29+
* Wraps the config screen implementation and provides a backup screen for
30+
* use when the config lib mod is not loaded. This allows the dependency to be
31+
* defined as optional.
3432
*/
3533
public class ConfigScreenProvider {
3634

3735
public static Screen getConfigScreen(Screen parent) {
3836
try {
3937
return ClothScreenProvider.getConfigScreen(parent);
40-
}
41-
catch (NoClassDefFoundError ignored) {
42-
return new BackupScreen(parent);
38+
} catch (NoClassDefFoundError ignored) {
39+
return new BackupScreen(parent, "installCloth", "https://modrinth.com/mod/9s6osm5g");
4340
}
4441
}
4542

46-
static class BackupScreen extends OptionsSubScreen {
47-
public BackupScreen(Screen parent) {
48-
super(parent, Minecraft.getInstance().options, localized("screen", "default"));
43+
static class BackupScreen extends Screen {
44+
private final Screen parent;
45+
private final String modKey;
46+
private final String modUrl;
47+
48+
public BackupScreen(Screen parent, String modKey, String modUrl) {
49+
super(localized("name"));
50+
this.parent = parent;
51+
this.modKey = modKey;
52+
this.modUrl = modUrl;
4953
}
5054

5155
@Override
5256
public void init() {
5357
MultiLineTextWidget messageWidget = new MultiLineTextWidget(
5458
width / 2 - 120, height / 2 - 40,
55-
localized("message", "install_cloth"),
59+
localized("message", modKey),
5660
minecraft.font);
5761
messageWidget.setMaxWidth(240);
5862
messageWidget.setCentered(true);
5963
addRenderableWidget(messageWidget);
6064

61-
Button openLinkButton = Button.builder(localized("message", "go_modrinth"),
65+
Button openLinkButton = Button.builder(localized("message", "viewModrinth"),
6266
(button) -> minecraft.setScreen(new ConfirmLinkScreen(
6367
(open) -> {
64-
if (open) Util.getPlatform().openUri("https://modrinth.com/mod/9s6osm5g");
65-
minecraft.setScreen(lastScreen);
66-
}, "https://modrinth.com/mod/9s6osm5g", true)))
68+
if (open) Util.getPlatform().openUri(modUrl);
69+
minecraft.setScreen(parent);
70+
}, modUrl, true)))
6771
.pos(width / 2 - 120, height / 2)
6872
.size(115, 20)
6973
.build();
@@ -76,8 +80,5 @@ public void init() {
7680
.build();
7781
addRenderableWidget(exitButton);
7882
}
79-
80-
@Override
81-
protected void addOptions() {}
8283
}
8384
}

‎common/src/main/java/dev/terminalmc/claimpoints/mixin/MixinChatComponent.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package dev.terminalmc.claimpoints.mixin;
1818

19-
import dev.terminalmc.claimpoints.chat.ChatScanner;
19+
import dev.terminalmc.claimpoints.util.ChatScanner;
2020
import net.minecraft.client.GuiMessageTag;
2121
import net.minecraft.client.gui.components.ChatComponent;
2222
import net.minecraft.network.chat.Component;
@@ -35,8 +35,6 @@ public class MixinChatComponent {
3535
cancellable = true
3636
)
3737
private void checkMessage(Component message, MessageSignature signature, GuiMessageTag tag, CallbackInfo ci) {
38-
if (ChatScanner.scanning() && ChatScanner.scan(message)) {
39-
ci.cancel();
40-
}
38+
if (ChatScanner.tryScan(message)) ci.cancel();
4139
}
4240
}

0 commit comments

Comments
 (0)