chore: TransformerWindowManager no longer returns itself on addTransf…

…ormer
xpdustry · Jun 3, 2024 · 9a245d0 · 9a245d0
1 parent cdcebfd
commit 9a245d0
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 18 deletions.
diff --git a/...tor-common-api/src/main/java/com/xpdustry/distributor/api/gui/input/TextInputManager.java b/...tor-common-api/src/main/java/com/xpdustry/distributor/api/gui/input/TextInputManager.java
@@ -21,7 +21,7 @@
 import com.xpdustry.distributor.api.gui.transform.TransformerWindowManager;
 import com.xpdustry.distributor.api.plugin.MindustryPlugin;
 
-public interface TextInputManager extends TransformerWindowManager<TextInputManager, TextInputPane> {
+public interface TextInputManager extends TransformerWindowManager<TextInputPane> {
 
     static TextInputManager create(final MindustryPlugin plugin) {
         return new TextInputManagerImpl(plugin);

diff --git a/...common-api/src/main/java/com/xpdustry/distributor/api/gui/input/TextInputManagerImpl.java b/...common-api/src/main/java/com/xpdustry/distributor/api/gui/input/TextInputManagerImpl.java
@@ -18,6 +18,7 @@
  */
 package com.xpdustry.distributor.api.gui.input;
 
+import com.xpdustry.distributor.api.DistributorProvider;
 import com.xpdustry.distributor.api.component.Component;
 import com.xpdustry.distributor.api.component.render.ComponentStringBuilder;
 import com.xpdustry.distributor.api.gui.Window;
@@ -31,8 +32,7 @@
 import mindustry.ui.Menus;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-final class TextInputManagerImpl extends AbstractTransformerWindowManager<TextInputManager, TextInputPane>
-        implements TextInputManager {
+final class TextInputManagerImpl extends AbstractTransformerWindowManager<TextInputPane> implements TextInputManager {
 
     private final int id = Menus.registerTextInput(this::handle);
     private final Set<MUUID> visible = new HashSet<>();
@@ -106,7 +106,10 @@ private void handle(final Player player, final @Nullable String input) {
     }
 
     private String render(final Window window, final Component component) {
-        return ComponentStringBuilder.mindustry(window.getAudience().getMetadata())
+        return ComponentStringBuilder.mindustry(DistributorProvider.get()
+                        .getAudienceProvider()
+                        .getPlayer(window.getViewer())
+                        .getMetadata())
                 .append(component)
                 .toString();
     }

diff --git a/distributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/menu/MenuManager.java b/distributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/menu/MenuManager.java
@@ -21,7 +21,7 @@
 import com.xpdustry.distributor.api.gui.transform.TransformerWindowManager;
 import com.xpdustry.distributor.api.plugin.MindustryPlugin;
 
-public interface MenuManager extends TransformerWindowManager<MenuManager, MenuPane> {
+public interface MenuManager extends TransformerWindowManager<MenuPane> {
 
     static MenuManager create(final MindustryPlugin plugin) {
         return new MenuManagerImpl(plugin);

diff --git a/...butor-common-api/src/main/java/com/xpdustry/distributor/api/gui/menu/MenuManagerImpl.java b/...butor-common-api/src/main/java/com/xpdustry/distributor/api/gui/menu/MenuManagerImpl.java
@@ -18,6 +18,7 @@
  */
 package com.xpdustry.distributor.api.gui.menu;
 
+import com.xpdustry.distributor.api.DistributorProvider;
 import com.xpdustry.distributor.api.component.Component;
 import com.xpdustry.distributor.api.component.render.ComponentStringBuilder;
 import com.xpdustry.distributor.api.gui.Window;
@@ -28,7 +29,7 @@
 import mindustry.gen.Player;
 import mindustry.ui.Menus;
 
-final class MenuManagerImpl extends AbstractTransformerWindowManager<MenuManager, MenuPane> implements MenuManager {
+final class MenuManagerImpl extends AbstractTransformerWindowManager<MenuPane> implements MenuManager {
 
     private final int id = Menus.registerMenu(this::handle);
 
@@ -98,7 +99,10 @@ private void handle(final Player player, final int option) {
     }
 
     private String render(final Window window, final Component component) {
-        return ComponentStringBuilder.mindustry(window.getAudience().getMetadata())
+        return ComponentStringBuilder.mindustry(DistributorProvider.get()
+                        .getAudienceProvider()
+                        .getPlayer(window.getViewer())
+                        .getMetadata())
                 .append(component)
                 .toString();
     }

diff --git a/...ributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/popup/PopupManager.java b/...ributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/popup/PopupManager.java
@@ -22,7 +22,7 @@
 import com.xpdustry.distributor.api.plugin.MindustryPlugin;
 import java.time.Duration;
 
-public interface PopupManager extends TransformerWindowManager<PopupManager, PopupPane> {
+public interface PopupManager extends TransformerWindowManager<PopupPane> {
 
     static PopupManager create(final MindustryPlugin plugin) {
         return new PopupManagerImpl(plugin);

diff --git a/...tor-common-api/src/main/java/com/xpdustry/distributor/api/gui/popup/PopupManagerImpl.java b/...tor-common-api/src/main/java/com/xpdustry/distributor/api/gui/popup/PopupManagerImpl.java
@@ -33,7 +33,7 @@
 import mindustry.game.EventType;
 import mindustry.gen.Call;
 
-final class PopupManagerImpl extends AbstractTransformerWindowManager<PopupManager, PopupPane> implements PopupManager {
+final class PopupManagerImpl extends AbstractTransformerWindowManager<PopupPane> implements PopupManager {
 
     private final Interval interval = new Interval();
     private Duration updateInterval = Duration.ZERO;
@@ -66,7 +66,10 @@ protected void onWindowOpen(final SimpleWindow window) {
         };
         Call.infoPopup(
                 window.getViewer().con(),
-                ComponentStringBuilder.mindustry(window.getAudience().getMetadata())
+                ComponentStringBuilder.mindustry(DistributorProvider.get()
+                                .getAudienceProvider()
+                                .getPlayer(window.getViewer())
+                                .getMetadata())
                         .append(window.getPane().getContent())
                         .toString(),
                 (Time.delta / 60F) * tickUpdateInterval,

diff --git a/...ain/java/com/xpdustry/distributor/api/gui/transform/AbstractTransformerWindowManager.java b/...ain/java/com/xpdustry/distributor/api/gui/transform/AbstractTransformerWindowManager.java
@@ -38,8 +38,8 @@
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public abstract class AbstractTransformerWindowManager<T extends TransformerWindowManager<T, P>, P extends Pane>
-        implements TransformerWindowManager<T, P>, PluginAware {
+public abstract class AbstractTransformerWindowManager<P extends Pane>
+        implements TransformerWindowManager<P>, PluginAware {
 
     private final MindustryPlugin plugin;
     private final EventSubscription playerLeaveListener;
@@ -82,11 +82,9 @@ public Collection<Window> getActiveWindows() {
         return Collections.unmodifiableCollection(this.windows.values());
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public final T addTransformer(final Transformer<P> transformer) {
+    public final void addTransformer(final Transformer<P> transformer) {
         transformers.add(Objects.requireNonNull(transformer));
-        return (T) this;
     }
 
     @Override

diff --git a/...pi/src/main/java/com/xpdustry/distributor/api/gui/transform/TransformerWindowManager.java b/...pi/src/main/java/com/xpdustry/distributor/api/gui/transform/TransformerWindowManager.java
@@ -21,8 +21,7 @@
 import com.xpdustry.distributor.api.gui.Pane;
 import com.xpdustry.distributor.api.gui.WindowManager;
 
-public interface TransformerWindowManager<T extends TransformerWindowManager<T, P>, P extends Pane>
-        extends WindowManager {
+public interface TransformerWindowManager<P extends Pane> extends WindowManager {
 
-    T addTransformer(final Transformer<P> transformer);
+    void addTransformer(final Transformer<P> transformer);
 }