chore: StringComponent(Decoder/Encoder) improvements

xpdustry · May 21, 2024 · e02fed1 · e02fed1
1 parent 052c7d8
commit e02fed1
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 21 deletions.
diff --git a/distributor-common-api/src/main/java/com/xpdustry/distributor/api/Distributor.java b/distributor-common-api/src/main/java/com/xpdustry/distributor/api/Distributor.java
@@ -44,11 +44,11 @@ public interface Distributor {
 
     StringComponentEncoder getMindustryEncoder();
 
+    StringComponentDecoder getMindustryDecoder();
+
     StringComponentEncoder getAnsiEncoder();
 
     StringComponentEncoder getPlainTextEncoder();
 
-    StringComponentDecoder getMindustryDecoder();
-
     AudienceProvider getAudienceProvider();
 }
diff --git a/...mmon-api/src/main/java/com/xpdustry/distributor/api/component/codec/ComponentDecoder.java b/...mmon-api/src/main/java/com/xpdustry/distributor/api/component/codec/ComponentDecoder.java
@@ -19,8 +19,11 @@
 package com.xpdustry.distributor.api.component.codec;
 
 import com.xpdustry.distributor.api.component.Component;
+import com.xpdustry.distributor.api.key.Key;
 
 public interface ComponentDecoder<C, T> {
 
     Component decode(final T input, final C context);
+
+    Key<Void> getKey();
 }
diff --git a/...mmon-api/src/main/java/com/xpdustry/distributor/api/component/codec/ComponentEncoder.java b/...mmon-api/src/main/java/com/xpdustry/distributor/api/component/codec/ComponentEncoder.java
@@ -19,8 +19,11 @@
 package com.xpdustry.distributor.api.component.codec;
 
 import com.xpdustry.distributor.api.component.Component;
+import com.xpdustry.distributor.api.key.Key;
 
 public interface ComponentEncoder<C, T> {
 
     T encode(final Component input, final C context);
+
+    Key<Void> getKey();
 }
diff --git a/...pi/src/main/java/com/xpdustry/distributor/api/component/codec/StringComponentDecoder.java b/...pi/src/main/java/com/xpdustry/distributor/api/component/codec/StringComponentDecoder.java
@@ -24,6 +24,4 @@
 public interface StringComponentDecoder extends ComponentDecoder<MetadataContainer, String> {
 
     Key<Void> MINDUSTRY_DECODER = Key.of(Key.DISTRIBUTOR_NAMESPACE, "mindustry-decoder");
-
-    Key<Void> getKey();
 }
diff --git a/...pi/src/main/java/com/xpdustry/distributor/api/component/codec/StringComponentEncoder.java b/...pi/src/main/java/com/xpdustry/distributor/api/component/codec/StringComponentEncoder.java
@@ -28,6 +28,4 @@ public interface StringComponentEncoder extends ComponentEncoder<MetadataContain
     Key<Void> ANSI_ENCODER = Key.of(Key.DISTRIBUTOR_NAMESPACE, "ansi-encoder");
 
     Key<Void> PLAINTEXT_ENCODER = Key.of(Key.DISTRIBUTOR_NAMESPACE, "plaintext-encoder");
-
-    Key<Void> getKey();
 }
diff --git a/...ributor-common/src/main/java/com/xpdustry/distributor/common/DistributorCommonPlugin.java b/...ributor-common/src/main/java/com/xpdustry/distributor/common/DistributorCommonPlugin.java
@@ -57,9 +57,9 @@ public final class DistributorCommonPlugin extends AbstractMindustryPlugin imple
     private @Nullable PlayerLookup lookup = null;
     private @Nullable PermissionReader permissions = null;
     private @Nullable StringComponentEncoder mindustryEncoder = null;
+    private @Nullable StringComponentDecoder mindustryDecoder = null;
     private @Nullable StringComponentEncoder ansiEncoder = null;
     private @Nullable StringComponentEncoder plainTextEncoder = null;
-    private @Nullable StringComponentDecoder mindustryDecoder = null;
     private @Nullable AudienceProvider audienceProvider = null;
 
     @Override
@@ -97,6 +97,11 @@ public StringComponentEncoder getMindustryEncoder() {
         return ensureInitialized(this.mindustryEncoder, "mindustry-string-encoder");
     }
 
+    @Override
+    public StringComponentDecoder getMindustryDecoder() {
+        return ensureInitialized(this.mindustryDecoder, "mindustry-string-decoder");
+    }
+
     @Override
     public StringComponentEncoder getPlainTextEncoder() {
         return ensureInitialized(this.plainTextEncoder, "plaintext-string-encoder");
@@ -107,11 +112,6 @@ public StringComponentEncoder getAnsiEncoder() {
         return ensureInitialized(this.ansiEncoder, "ansi-string-encoder");
     }
 
-    @Override
-    public StringComponentDecoder getMindustryDecoder() {
-        return ensureInitialized(this.mindustryDecoder, "mindustry-string-decoder");
-    }
-
     @Override
     public AudienceProvider getAudienceProvider() {
         return ensureInitialized(this.audienceProvider, "audience-provider");
@@ -136,6 +136,12 @@ public void onLoad() {
                 StringComponentEncoder.MINDUSTRY_ENCODER,
                 MindustryEncoderImpl::new);
 
+        this.mindustryDecoder = findNamedService(
+                StringComponentDecoder.class,
+                StringComponentDecoder::getKey,
+                MindustryDecoderImpl.MINDUSTRY_DECODER,
+                MindustryDecoderImpl::new);
+
         this.ansiEncoder = findNamedService(
                 StringComponentEncoder.class,
                 StringComponentEncoder::getKey,
@@ -148,12 +154,6 @@ public void onLoad() {
                 StringComponentEncoder.PLAINTEXT_ENCODER,
                 PlainTextEncoderImpl::new);
 
-        this.mindustryDecoder = findNamedService(
-                StringComponentDecoder.class,
-                StringComponentDecoder::getKey,
-                MindustryDecoderImpl.MINDUSTRY_DECODER,
-                MindustryDecoderImpl::new);
-
         this.audienceProvider = services.provideOrDefault(AudienceProvider.class, () -> new AudienceProviderImpl(this));
 
         this.getLogger().info("Loaded distributor common api");

diff --git a/...common/src/main/java/com/xpdustry/distributor/common/component/codec/AnsiEncoderImpl.java b/...common/src/main/java/com/xpdustry/distributor/common/component/codec/AnsiEncoderImpl.java
@@ -31,7 +31,7 @@
 public final class AnsiEncoderImpl extends AbstractStringComponentEncoder {
 
     @Override
-    public Key getKey() {
+    public Key<Void> getKey() {
         return ANSI_ENCODER;
     }
 

diff --git a/...n/src/main/java/com/xpdustry/distributor/common/component/codec/MindustryEncoderImpl.java b/...n/src/main/java/com/xpdustry/distributor/common/component/codec/MindustryEncoderImpl.java
@@ -29,7 +29,7 @@
 public final class MindustryEncoderImpl extends AbstractStringComponentEncoder {
 
     @Override
-    public Key getKey() {
+    public Key<Void> getKey() {
         return MINDUSTRY_ENCODER;
     }
 

diff --git a/...n/src/main/java/com/xpdustry/distributor/common/component/codec/PlainTextEncoderImpl.java b/...n/src/main/java/com/xpdustry/distributor/common/component/codec/PlainTextEncoderImpl.java
@@ -25,7 +25,7 @@
 public final class PlainTextEncoderImpl extends AbstractStringComponentEncoder {
 
     @Override
-    public Key getKey() {
+    public Key<Void> getKey() {
         return PLAINTEXT_ENCODER;
     }