feat: Remove Metadata argument from ComponentRendererProvider in favo…

…r of ComponentAppendable context
xpdustry · May 28, 2024 · d12cf79 · d12cf79
1 parent 91f64b2
commit d12cf79
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/.../src/main/java/com/xpdustry/distributor/api/component/render/AnsiComponentAppendable.java b/.../src/main/java/com/xpdustry/distributor/api/component/render/AnsiComponentAppendable.java
@@ -48,6 +48,11 @@ final class AnsiComponentAppendable implements ComponentAppendable {
         this.provider = provider;
     }
 
+    @Override
+    public MetadataContainer getContext() {
+        return context;
+    }
+
     @Override
     public ComponentAppendable append(final Component component) {
         escape();
@@ -62,7 +67,7 @@ public ComponentAppendable append(final Component component) {
         }
 
         final var renderer = provider.getRenderer(component);
-        if (renderer != null) renderer.render(component, this, context);
+        if (renderer != null) renderer.render(component, this);
 
         {
             final var popped = styles.pop();

diff --git a/...-api/src/main/java/com/xpdustry/distributor/api/component/render/ComponentAppendable.java b/...-api/src/main/java/com/xpdustry/distributor/api/component/render/ComponentAppendable.java
@@ -50,6 +50,8 @@ static ComponentAppendable mindustry(final MetadataContainer metadata) {
                 metadata, DistributorProvider.get().getComponentRendererProvider());
     }
 
+    MetadataContainer getContext();
+
     ComponentAppendable append(final Component component);
 
     @Override

diff --git a/...on-api/src/main/java/com/xpdustry/distributor/api/component/render/ComponentRenderer.java b/...on-api/src/main/java/com/xpdustry/distributor/api/component/render/ComponentRenderer.java
@@ -19,13 +19,12 @@
 package com.xpdustry.distributor.api.component.render;
 
 import com.xpdustry.distributor.api.component.Component;
-import com.xpdustry.distributor.api.metadata.MetadataContainer;
 
 public interface ComponentRenderer<T extends Component> {
 
     static <T extends Component> ComponentRenderer<T> noop() {
-        return (component, appendable, metadata) -> {};
+        return (component, appendable) -> {};
     }
 
-    void render(final T component, final ComponentAppendable appendable, final MetadataContainer metadata);
+    void render(final T component, final ComponentAppendable appendable);
 }
diff --git a/...main/java/com/xpdustry/distributor/api/component/render/MindustryComponentAppendable.java b/...main/java/com/xpdustry/distributor/api/component/render/MindustryComponentAppendable.java
@@ -35,6 +35,11 @@ final class MindustryComponentAppendable implements ComponentAppendable {
         this.provider = provider;
     }
 
+    @Override
+    public MetadataContainer getContext() {
+        return context;
+    }
+
     @Override
     public ComponentAppendable append(final Component component) {
         {
@@ -48,7 +53,7 @@ public ComponentAppendable append(final Component component) {
         }
 
         final var renderer = provider.getRenderer(component);
-        if (renderer != null) renderer.render(component, this, context);
+        if (renderer != null) renderer.render(component, this);
 
         {
             final var popped = colors.pop();

diff --git a/...src/main/java/com/xpdustry/distributor/api/component/render/PlainComponentAppendable.java b/...src/main/java/com/xpdustry/distributor/api/component/render/PlainComponentAppendable.java
@@ -33,10 +33,15 @@ public PlainComponentAppendable(final MetadataContainer context, final Component
         this.provider = provider;
     }
 
+    @Override
+    public MetadataContainer getContext() {
+        return context;
+    }
+
     @Override
     public ComponentAppendable append(final Component component) {
         final var renderer = this.provider.getRenderer(component);
-        if (renderer != null) renderer.render(component, this, this.context);
+        if (renderer != null) renderer.render(component, this);
         return this;
     }
 

diff --git a/...a/com/xpdustry/distributor/common/component/render/StandardComponentRendererProvider.java b/...a/com/xpdustry/distributor/common/component/render/StandardComponentRendererProvider.java
@@ -29,7 +29,6 @@
 import com.xpdustry.distributor.api.component.render.ComponentAppendable;
 import com.xpdustry.distributor.api.component.render.ComponentRenderer;
 import com.xpdustry.distributor.api.component.render.ComponentRendererProvider;
-import com.xpdustry.distributor.api.metadata.MetadataContainer;
 import com.xpdustry.distributor.api.translation.ComponentAwareTranslation;
 import java.time.ZoneId;
 import java.util.Locale;
@@ -60,8 +59,7 @@ private static final class TextComponentRenderer implements ComponentRenderer<Te
         private static final TextComponentRenderer INSTANCE = new TextComponentRenderer();
 
         @Override
-        public void render(
-                final TextComponent component, final ComponentAppendable appendable, final MetadataContainer metadata) {
+        public void render(final TextComponent component, final ComponentAppendable appendable) {
             appendable.append(component.getContent());
         }
     }
@@ -71,8 +69,7 @@ private static final class ListComponentRenderer implements ComponentRenderer<Li
         private static final ListComponentRenderer INSTANCE = new ListComponentRenderer();
 
         @Override
-        public void render(
-                final ListComponent component, final ComponentAppendable appendable, final MetadataContainer metadata) {
+        public void render(final ListComponent component, final ComponentAppendable appendable) {
             for (final var child : component.getComponents()) {
                 appendable.append(child);
             }
@@ -84,15 +81,13 @@ private static final class TemporalComponentRenderer implements ComponentRendere
         private static final TemporalComponentRenderer INSTANCE = new TemporalComponentRenderer();
 
         @Override
-        public void render(
-                final TemporalComponent component,
-                final ComponentAppendable appendable,
-                final MetadataContainer metadata) {
+        public void render(final TemporalComponent component, final ComponentAppendable appendable) {
             component
                     .getFormat()
                     .toFormatter()
                     .withZone(ZoneId.of("UTC"))
-                    .withLocale(metadata.getMetadata(Audience.LOCALE).orElseGet(Locale::getDefault))
+                    .withLocale(
+                            appendable.getContext().getMetadata(Audience.LOCALE).orElseGet(Locale::getDefault))
                     .formatTo(component.getTemporal(), appendable);
         }
     }
@@ -102,15 +97,12 @@ private static final class TranslatableComponentRenderer implements ComponentRen
         private static final TranslatableComponentRenderer INSTANCE = new TranslatableComponentRenderer();
 
         @Override
-        public void render(
-                final TranslatableComponent component,
-                final ComponentAppendable appendable,
-                final MetadataContainer metadata) {
+        public void render(final TranslatableComponent component, final ComponentAppendable appendable) {
             final var translation = DistributorProvider.get()
                     .getGlobalTranslationSource()
                     .getTranslationOrMissing(
                             component.getKey(),
-                            metadata.getMetadata(Audience.LOCALE).orElseGet(Locale::getDefault));
+                            appendable.getContext().getMetadata(Audience.LOCALE).orElseGet(Locale::getDefault));
             if (translation instanceof ComponentAwareTranslation aware) {
                 aware.formatTo(component.getParameters(), appendable);
             } else {
@@ -124,10 +116,7 @@ private static final class ValueComponentRenderer implements ComponentRenderer<V
         private static final ValueComponentRenderer INSTANCE = new ValueComponentRenderer();
 
         @Override
-        public void render(
-                final ValueComponent<?> component,
-                final ComponentAppendable appendable,
-                final MetadataContainer metadata) {
+        public void render(final ValueComponent<?> component, final ComponentAppendable appendable) {
             appendable.append(component.getValue().toString());
         }
     }