refactor: cleanup formatters

Author: Silthus

platform/src/main/java/net/silthus/schat/platform/config/adapter/ConfigurateAdapter.java

@@ -34,11 +34,11 @@
 import net.silthus.schat.platform.config.serializers.ChannelSerializer;
 import net.silthus.schat.platform.config.serializers.ColorSerializer;
 import net.silthus.schat.platform.config.serializers.MiniMessageComponentSerializer;
-import net.silthus.schat.platform.config.serializers.PointeredFormatSerializer;
+import net.silthus.schat.platform.config.serializers.MiniMessageFormatSerializer;
 import net.silthus.schat.platform.config.serializers.SettingsSerializer;
 import net.silthus.schat.platform.config.serializers.TextDecorationSerializer;
 import net.silthus.schat.pointer.Settings;
-import net.silthus.schat.ui.format.PointeredFormat;
+import net.silthus.schat.ui.format.Format;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.ConfigurationOptions;
@@ -54,7 +54,7 @@ public abstract class ConfigurateAdapter<T extends AbstractConfigurationLoader.B
         .register(ChannelConfig.class, new ChannelSerializer())
         .register(TextColor.class, new ColorSerializer())
         .register(TextDecoration.class, new TextDecorationSerializer())
-        .register(PointeredFormat.class, new PointeredFormatSerializer())
+        .register(Format.class, new MiniMessageFormatSerializer())
         .build();
 
     private static final Function<ConfigurationOptions, ConfigurationOptions> DEFAULT_OPTIONS = options ->

…rializers/PointeredFormatSerializer.java …alizers/MiniMessageFormatSerializer.javaplatform/src/main/java/net/silthus/schat/platform/config/serializers/PointeredFormatSerializer.java renamed to platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageFormatSerializer.java platform/src/main/java/net/silthus/schat/platform/config/serializers/PointeredFormatSerializer.java renamed to platform/src/main/java/net/silthus/schat/platform/config/serializers/MiniMessageFormatSerializer.java

@@ -25,23 +25,23 @@
 package net.silthus.schat.platform.config.serializers;
 
 import java.lang.reflect.Type;
+import net.silthus.schat.ui.format.Format;
 import net.silthus.schat.ui.format.MiniMessageFormat;
-import net.silthus.schat.ui.format.PointeredFormat;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
-public class PointeredFormatSerializer implements TypeSerializer<PointeredFormat> {
+public class MiniMessageFormatSerializer implements TypeSerializer<Format> {
     @Override
-    public void serialize(Type type, @Nullable PointeredFormat obj, ConfigurationNode node) throws SerializationException {
+    public void serialize(Type type, @Nullable Format obj, ConfigurationNode node) throws SerializationException {
         if (obj instanceof MiniMessageFormat format) {
             node.set(format.format());
         }
     }
 
     @Override
-    public PointeredFormat deserialize(Type type, ConfigurationNode node) throws SerializationException {
+    public Format deserialize(Type type, ConfigurationNode node) throws SerializationException {
         return new MiniMessageFormat(node.getString());
     }
 }

platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java

@@ -78,7 +78,10 @@ void loads_defined_channel_settings() {
 
     @Test
     void loads_message_format() {
-        final Component format = getTestChannelConfig().settings().get(CHANNEL_FORMAT).get(MESSAGE_FORMAT).format(View.empty(), message("Hey").source(Identity.identity("Notch")).create());
+        final Component format = getTestChannelConfig().settings()
+            .get(CHANNEL_FORMAT)
+            .get(MESSAGE_FORMAT)
+            .format(View.empty(), message("Hey").source(Identity.identity("Notch")).create());
         assertThat(format).isEqualTo(text("Notch", YELLOW).append(text(": Hey", GRAY)));
     }
 

ui/src/main/java/net/silthus/schat/ui/format/ChannelFormat.java

@@ -24,9 +24,11 @@
 
 package net.silthus.schat.ui.format;
 
+import net.kyori.adventure.text.Component;
+import net.silthus.schat.pointer.Pointered;
 import net.silthus.schat.ui.view.View;
 
 @FunctionalInterface
-public interface Format<T> {
-    net.kyori.adventure.text.Component format(View view, T type);
+public interface Format {
+    Component format(View view, Pointered entity);
 }

ui/src/main/java/net/silthus/schat/ui/format/ChannelFormatter.java

@@ -38,7 +38,7 @@
 
 @Getter
 @Accessors(fluent = true)
-public class MiniMessageFormat<T extends Pointered> implements PointeredFormat<T> {
+public class MiniMessageFormat implements Format {
     private final MiniMessage formatter = MiniMessage.miniMessage();
     private final String format;
 

ui/src/main/java/net/silthus/schat/ui/format/Format.java

@@ -41,9 +41,7 @@
 import net.silthus.schat.message.Message;
 import net.silthus.schat.pointer.Setting;
 import net.silthus.schat.pointer.Settings;
-import net.silthus.schat.ui.format.ChannelFormat;
 import net.silthus.schat.ui.format.Format;
-import net.silthus.schat.ui.format.MessageFormat;
 import net.silthus.schat.ui.model.ChatterViewModel;
 import net.silthus.schat.ui.view.View;
 import org.jetbrains.annotations.NotNull;
@@ -88,40 +86,40 @@ public final class TabbedChannelsView implements View {
         .suffix(text(" |"))
         .build());
 
-    public static final Setting<MessageFormat> MESSAGE_FORMAT = setting(MessageFormat.class, "message", (view, msg) ->
+    public static final Setting<Format> MESSAGE_FORMAT = setting(Format.class, "message", (view, msg) ->
         msg.get(Message.SOURCE)
             .filter(Identity.IS_NOT_NIL)
             .map(identity -> identity.displayName().append(text(": ")))
             .orElse(Component.empty())
             .append(msg.getOrDefault(Message.TEXT, Component.empty())));
 
-    public static final Setting<ChannelFormat> ACTIVE_CHANNEL_FORMAT = setting(ChannelFormat.class, "active_channel", (view, channel) ->
-        channel.get(DISPLAY_NAME)
+    public static final Setting<Format> ACTIVE_CHANNEL_FORMAT = setting(Format.class, "active_channel", (view, channel) ->
+        channel.getOrDefault(DISPLAY_NAME, Component.empty())
             .colorIfAbsent(GREEN)
             .decorate(UNDERLINED)
     );
 
-    public static final Setting<ChannelFormat> INACTIVE_CHANNEL_FORMAT = setting(ChannelFormat.class, "inactive_channel", (view, channel) ->
-        channel.getOrDefault(DISPLAY_NAME, text(channel.key()))
+    public static final Setting<Format> INACTIVE_CHANNEL_FORMAT = setting(Format.class, "inactive_channel", (view, channel) ->
+        channel.getOrDefault(DISPLAY_NAME, Component.empty())
             .colorIfAbsent(GRAY)
             .hoverEvent(translatable("schat.hover.join-channel")
-                .args(channel.get(DISPLAY_NAME))
+                .args(channel.getOrDefault(DISPLAY_NAME, Component.empty()))
                 .color(GRAY)
             ).clickEvent(
-                clickEvent(RUN_COMMAND, "/channel join " + channel.key())
+                clickEvent(RUN_COMMAND, "/channel join " + channel.getOrDefault(Channel.KEY, "unknown"))
             )
     );
 
     public static final Settings.Builder DEFAULT_FORMAT_SETTINGS = Settings.settingsBuilder()
         .withStatic(MESSAGE_FORMAT, MESSAGE_FORMAT.defaultValue())
-        .withStatic(ACTIVE_CHANNEL_FORMAT, (view, channel) -> ACTIVE_CHANNEL_DECORATION.apply(channel.displayName()))
-        .withStatic(INACTIVE_CHANNEL_FORMAT, (view, channel) -> INACTIVE_CHANNEL_DECORATION.apply(channel, channel.displayName()));
+        .withStatic(ACTIVE_CHANNEL_FORMAT, (view, channel) -> ACTIVE_CHANNEL_DECORATION.apply(channel.getOrDefault(DISPLAY_NAME, Component.empty())))
+        .withStatic(INACTIVE_CHANNEL_FORMAT, (view, channel) -> INACTIVE_CHANNEL_DECORATION.apply((Channel) channel, channel.getOrDefault(DISPLAY_NAME, Component.empty())));
 
     public static final Setting<Settings> CHANNEL_FORMAT = setting(Settings.class, "format", DEFAULT_FORMAT_SETTINGS.create());
     public static final Setting<Settings> PRIVATE_CHANNEL_FORMAT = setting(Settings.class, "private_channel_format", Settings.settingsBuilder()
-        .withStatic(MESSAGE_FORMAT, (view, message) -> renderPrivateMessage(((TabbedChannelsView) view).chatter(), message))
-        .withStatic(ACTIVE_CHANNEL_FORMAT, (view, channel) -> ACTIVE_CHANNEL_DECORATION.apply(renderPrivateChannelName(((TabbedChannelsView) view).chatter(), channel)))
-        .withStatic(INACTIVE_CHANNEL_FORMAT, (view, channel) -> INACTIVE_CHANNEL_DECORATION.apply(channel, renderPrivateChannelName(((TabbedChannelsView) view).chatter(), channel)))
+        .withStatic(MESSAGE_FORMAT, (view, message) -> renderPrivateMessage(((TabbedChannelsView) view).chatter(), (Message) message))
+        .withStatic(ACTIVE_CHANNEL_FORMAT, (view, channel) -> ACTIVE_CHANNEL_DECORATION.apply(renderPrivateChannelName(((TabbedChannelsView) view).chatter(), (Channel) channel)))
+        .withStatic(INACTIVE_CHANNEL_FORMAT, (view, channel) -> INACTIVE_CHANNEL_DECORATION.apply((Channel) channel, renderPrivateChannelName(((TabbedChannelsView) view).chatter(), (Channel) channel)))
         .create()
     );
 
@@ -218,11 +216,11 @@ private boolean isMessageDisplayed(Message message) {
     public class Tab {
         private final Channel channel;
 
-        private Format<Message> messageFormat;
-        private Format<Channel> activeFormat;
-        private Format<Channel> inactiveFormat;
+        private Format messageFormat;
+        private Format activeFormat;
+        private Format inactiveFormat;
 
-        protected Tab(Channel channel, Format<Message> messageFormat, Format<Channel> activeFormat, Format<Channel> inactiveFormat) {
+        protected Tab(Channel channel, Format messageFormat, Format activeFormat, Format inactiveFormat) {
             this.channel = channel;
 
             this.messageFormat = messageFormat;