Skip to content

Commit 893b8df

Browse files
srnyxsrnyx
committed
Minor fixes
1 parent f085cc1 commit 893b8df

10 files changed

Lines changed: 35 additions & 63 deletions

File tree

‎src/main/java/gg/eventalerts/eventalertsintegration/config/ConfigYml.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@
1313
import org.bukkit.SoundCategory;
1414
import org.jetbrains.annotations.NotNull;
1515
import org.jetbrains.annotations.Nullable;
16-
import xyz.srnyx.annoyingapi.AnnoyingPlugin;
1716
import xyz.srnyx.annoyingapi.file.PlayableSound;
18-
import xyz.srnyx.annoyingapi.libs.javautilities.HttpUtility;
1917
import xyz.srnyx.annoyingapi.libs.javautilities.manipulation.DurationFormatter;
2018

2119
import java.time.Duration;
2220
import java.time.temporal.ChronoUnit;
2321
import java.util.HashSet;
2422
import java.util.Set;
25-
import java.util.logging.Level;
2623

2724

2825
@Header("# --- WIKIS ---")
@@ -293,11 +290,11 @@ public EventMessages(@Nullable EventAlertsIntegration plugin) {
293290
@NotNull public Set<String> host_filter = new HashSet<>();
294291

295292
public boolean isInHostFilter(@NotNull ObjectId serverId) {
296-
return host_filter.contains(serverId.toString());
293+
return host_filter.isEmpty() || host_filter.contains(serverId.toString());
297294
}
298295

299296
public boolean isInHostFilter(long hostId) {
300-
return host_filter.contains(Long.toString(hostId));
297+
return host_filter.isEmpty() || host_filter.contains(Long.toString(hostId));
301298
}
302299

303300
public void setEnabled(boolean newStatus) {
@@ -322,7 +319,6 @@ public boolean toggleIgnoredPartnerRole(@NotNull PingRole role) {
322319
return toggleSetItem(ignored_partner_roles, role);
323320
}
324321

325-
//TODO
326322
public boolean toggleIgnoredFormat(@NotNull EventFormat format) {
327323
return toggleSetItem(ignored_formats, format);
328324
}
@@ -423,6 +419,9 @@ public void setUseTestingApi(boolean newStatus) {
423419
}
424420

425421
public static class Websocket extends SubConfig {
422+
@NotNull public static final Duration RETRY_DELAY_MIN = Duration.ofMinutes(3); // Change in @DurationRange too
423+
@NotNull public static final Duration RETRY_DELAY_DEFAULT = Duration.ofMinutes(5);
424+
426425
public Websocket(@Nullable EventAlertsIntegration plugin) {
427426
super(plugin);
428427
}
@@ -434,7 +433,7 @@ public Websocket(@Nullable EventAlertsIntegration plugin) {
434433
@Comment("Duration until the websocket attempts to reconnect after being disconnected (min: 3 minutes)")
435434
@DurationSpec(fallbackUnit = ChronoUnit.MINUTES)
436435
@DurationRange(min = 3, minUnit = ChronoUnit.MINUTES)
437-
@NotNull public Duration retry_delay = Duration.ofMinutes(5);
436+
@NotNull public Duration retry_delay = RETRY_DELAY_DEFAULT;
438437

439438
@Comment
440439
@Comment("Whether to log websocket connection messages")

‎src/main/java/gg/eventalerts/eventalertsintegration/config/migration/C0003_Migrate_negative_retry_delay.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package gg.eventalerts.eventalertsintegration.config.migration;
22

33
import eu.okaeri.configs.migrate.builtin.NamedMigration;
4+
import gg.eventalerts.eventalertsintegration.config.ConfigYml;
45
import xyz.srnyx.annoyingapi.libs.javautilities.manipulation.Mapper;
56

6-
import java.time.Duration;
7-
87
import static eu.okaeri.configs.migrate.ConfigMigrationDsl.*;
98

109

@@ -22,6 +21,6 @@ public C0003_Migrate_negative_retry_delay() {
2221
}),
2322
multi(
2423
update("advanced.websockets.retry", oldValue -> false),
25-
update("advanced.websockets.retry_delay", oldValue -> Duration.ofMinutes(5)))));
24+
update("advanced.websockets.retry_delay", oldValue -> ConfigYml.Advanced.Websocket.RETRY_DELAY_DEFAULT))));
2625
}
2726
}

‎src/main/java/gg/eventalerts/eventalertsintegration/config/serdes/HostFilterSerializer.java‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/main/java/gg/eventalerts/eventalertsintegration/gui/config/ConfigGui.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public ConfigGui(@NotNull EventAlertsIntegration plugin, @NotNull Player opener)
3636
super(plugin, opener);
3737
}
3838

39-
public ConfigGui(@NotNull EAGui parent) {
39+
public ConfigGui(@NotNull ConfigGui parent) {
4040
super(parent);
4141
}
4242

‎src/main/java/gg/eventalerts/eventalertsintegration/gui/config/advanced/AdvancedGui.java‎

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

1414

1515
public class AdvancedGui extends ConfigGui {
16-
public AdvancedGui(@NotNull EAGui parent) {
16+
public AdvancedGui(@NotNull ConfigGui parent) {
1717
super(parent);
1818
}
1919

‎src/main/java/gg/eventalerts/eventalertsintegration/gui/config/eventmessages/EventMessagesGui.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import dev.triumphteam.gui.paper.Gui;
44
import dev.triumphteam.gui.paper.builder.gui.PaperGuiBuilder;
55
import dev.triumphteam.gui.paper.builder.item.ItemBuilder;
6-
import gg.eventalerts.eventalertsintegration.gui.EAGui;
76
import gg.eventalerts.eventalertsintegration.gui.config.ConfigGui;
87
import gg.eventalerts.eventalertsintegration.gui.config.eventmessages.sound.SoundGui;
98
import net.kyori.adventure.text.Component;
@@ -14,7 +13,7 @@
1413

1514

1615
public class EventMessagesGui extends ConfigGui {
17-
public EventMessagesGui(@NotNull EAGui parent) {
16+
public EventMessagesGui(@NotNull ConfigGui parent) {
1817
super(parent);
1918
}
2019

‎src/main/java/gg/eventalerts/eventalertsintegration/gui/config/eventmessages/HostFilterGui.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ public PaperGuiBuilder getGui() {
3939
final PaperGuiBuilder builder = Gui.of(6)
4040
.title(Component.text("Host Filter"));
4141

42+
// Add entry items
4243
int i = 0;
4344
for (final String id : ids) {
4445
if (i >= ADD_SLOT) break;
4546
final int slot = i++;
46-
final HostFilter hostFilter = HostFilter.fromId(id);
47-
builder.statelessComponent(container -> container.setItem(slot, hostFilterItem(id, hostFilter)));
47+
builder.statelessComponent(container -> container.setItem(slot, hostFilterItem(id, HostFilter.fromId(id))));
4848
}
4949

5050
return builder

‎src/main/java/gg/eventalerts/eventalertsintegration/gui/config/syncing/SyncingGui.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import dev.triumphteam.gui.paper.Gui;
44
import dev.triumphteam.gui.paper.builder.gui.PaperGuiBuilder;
55
import dev.triumphteam.gui.paper.builder.item.ItemBuilder;
6-
import gg.eventalerts.eventalertsintegration.gui.EAGui;
76
import gg.eventalerts.eventalertsintegration.gui.Heads;
87
import gg.eventalerts.eventalertsintegration.gui.config.ConfigGui;
98
import gg.eventalerts.eventalertsintegration.gui.config.syncing.discordtominecraft.MessagesGui;
@@ -14,7 +13,7 @@
1413

1514

1615
public class SyncingGui extends ConfigGui {
17-
public SyncingGui(@NotNull EAGui parent) {
16+
public SyncingGui(@NotNull ConfigGui parent) {
1817
super(parent);
1918
}
2019

‎src/main/java/gg/eventalerts/eventalertsintegration/gui/config/syncing/discordtominecraft/MessagesGui.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import dev.triumphteam.gui.paper.Gui;
44
import dev.triumphteam.gui.paper.builder.gui.PaperGuiBuilder;
55
import dev.triumphteam.gui.paper.builder.item.ItemBuilder;
6-
import gg.eventalerts.eventalertsintegration.gui.EAGui;
76
import gg.eventalerts.eventalertsintegration.gui.GuiInputType;
8-
import gg.eventalerts.eventalertsintegration.gui.config.ConfigGui;
7+
import gg.eventalerts.eventalertsintegration.gui.config.syncing.SyncingGui;
98
import net.kyori.adventure.text.Component;
109
import net.kyori.adventure.text.event.ClickEvent;
1110
import net.kyori.adventure.text.format.NamedTextColor;
@@ -14,8 +13,8 @@
1413
import org.jetbrains.annotations.NotNull;
1514

1615

17-
public class MessagesGui extends ConfigGui {
18-
public MessagesGui(@NotNull EAGui parent) {
16+
public class MessagesGui extends SyncingGui {
17+
public MessagesGui(@NotNull SyncingGui parent) {
1918
super(parent);
2019
}
2120

‎src/main/java/gg/eventalerts/eventalertsintegration/listeners/ChatListener.java‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import eu.okaeri.configs.schema.GenericsDeclaration;
44
import eu.okaeri.configs.serdes.SerdesContext;
55
import gg.eventalerts.eventalertsintegration.EventAlertsIntegration;
6+
import gg.eventalerts.eventalertsintegration.config.ConfigYml;
67
import gg.eventalerts.eventalertsintegration.config.HostFilter;
78
import gg.eventalerts.eventalertsintegration.gui.GuiInputType;
89
import gg.eventalerts.eventalertsintegration.gui.EAGui;
@@ -111,6 +112,7 @@ private void handleSoundVolume(@NotNull Player player, @NotNull String message)
111112
volume = Float.parseFloat(message);
112113
} catch (final NumberFormatException e) {
113114
player.sendMessage(Component.text()
115+
.color(NamedTextColor.RED)
114116
.append(Component.text("\n" + message, NamedTextColor.DARK_RED))
115117
.append(Component.text(" is not a valid float!", NamedTextColor.RED))
116118
.append(ConfigGui.CANCEL));
@@ -143,6 +145,7 @@ private void handleSoundPitch(@NotNull Player player, @NotNull String message) {
143145
pitch = Float.parseFloat(message);
144146
} catch (final NumberFormatException e) {
145147
player.sendMessage(Component.text()
148+
.color(NamedTextColor.RED)
146149
.append(Component.text("\n" + message, NamedTextColor.DARK_RED))
147150
.append(Component.text(" is not a valid float!", NamedTextColor.RED))
148151
.append(ConfigGui.CANCEL));
@@ -197,12 +200,25 @@ private void handleRetryDelay(@NotNull Player player, @NotNull String message) {
197200
.transform(message, SerdesContext.of(plugin.config.getConfigurer()));
198201
if (retryDelay == null) {
199202
player.sendMessage(Component.text()
203+
.color(NamedTextColor.RED)
200204
.append(Component.text("\n" + message, NamedTextColor.DARK_RED))
201205
.append(Component.text(" is not a valid duration!", NamedTextColor.RED))
202206
.append(ConfigGui.CANCEL));
203207
return;
204208
}
205209

210+
// Check if above minimum
211+
if (retryDelay.compareTo(ConfigYml.Advanced.Websocket.RETRY_DELAY_MIN) < 0) {
212+
player.sendMessage(Component.text()
213+
.color(NamedTextColor.RED)
214+
.append(Component.text("\n" + message, NamedTextColor.DARK_RED))
215+
.append(Component.text(" is below the minimum of "))
216+
.append(Component.text(ConfigYml.Advanced.Websocket.formatRetryDelay(ConfigYml.Advanced.Websocket.RETRY_DELAY_MIN), NamedTextColor.DARK_RED))
217+
.append(Component.text("!"))
218+
.append(ConfigGui.CANCEL));
219+
return;
220+
}
221+
206222
// Set retry delay
207223
plugin.config.advanced.websocket.setRetryDelay(retryDelay);
208224

@@ -239,7 +255,8 @@ private void handleHostFilter(@NotNull Player player, @NotNull String message) {
239255
// Add to filter
240256
if (!plugin.config.event_messages.addHostFilter(id)) {
241257
player.sendMessage(Component.text()
242-
.append(Component.text("\nThis " + hostFilter.lower + " is already in the host filter!\n", NamedTextColor.RED))
258+
.color(NamedTextColor.RED)
259+
.append(Component.text("\nThis " + hostFilter.lower + " is already in the host filter!", NamedTextColor.RED))
243260
.append(ConfigGui.CANCEL));
244261
return;
245262
}

0 commit comments

Comments
 (0)