feat: Add QOL changes to distributor gui

xpdustry · Oct 14, 2024 · 7caf9e5 · 7caf9e5
1 parent 77db635
commit 7caf9e5
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 8 deletions.
diff --git a/distributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/BiAction.java b/distributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/BiAction.java
@@ -18,6 +18,8 @@
  */
 package com.xpdustry.distributor.api.gui;
 
+import com.xpdustry.distributor.api.key.Key;
+
 /**
  * A function that is executed when an interaction occurs in a gui. Takes an additional parameter as the input.
  */
@@ -34,6 +36,17 @@ static <T> BiAction<T> from(final Action action) {
  return (window, value) -> action.act(window);
  }
 
+ /**
+ * Returns a bi-action that sets a state entry with the bi-action input.
+ *
+ * @param key the key
+ * @param <T> the type of the value
+ * @return the bi-action
+ */
+ static <T> BiAction<T> with(final Key<T> key) {
+ return (window, value) -> window.getState().set(key, value);
+ }
+
  /**
  * Executes the bi-action.
  *

diff --git a/distributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/menu/MenuGrid.java b/distributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/menu/MenuGrid.java
@@ -51,4 +51,12 @@ default MenuGrid addRow(final int index, final MenuOption... options) {
  @Nullable MenuOption getOption(final int id);
 
  MenuOption getOption(final int x, final int y);
+
+ MenuGrid addOption(final MenuOption option);
+
+ MenuOption addOption(final int y, final MenuOption option);
+
+ MenuOption addOption(final int x, final int y, final MenuOption option);
+
+ MenuGrid removeOption(final int x, final int y);
 }
diff --git a/distributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/menu/MenuGridImpl.java b/distributor-common-api/src/main/java/com/xpdustry/distributor/api/gui/menu/MenuGridImpl.java
@@ -19,6 +19,7 @@
 package com.xpdustry.distributor.api.gui.menu;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
@@ -30,12 +31,12 @@ final class MenuGridImpl implements MenuGrid {
 
  @Override
  public List<List<MenuOption>> getOptions() {
- return options.stream().map(List::copyOf).toList();
+ return options.stream().map(Collections::unmodifiableList).toList();
  }
 
  @Override
  public List<MenuOption> getRow(int index) {
- return options.get(index);
+ return Collections.unmodifiableList(options.get(index));
  }
 
  @Override
@@ -79,6 +80,39 @@ public MenuOption getOption(final int x, final int y) {
  return options.get(y).get(x);
  }
 
+ @Override
+ public MenuGrid addOption(final MenuOption option) {
+ if (options.isEmpty()) {
+ addRow(List.of(option));
+ } else {
+ final var row = options.get(options.size() - 1);
+ row.add(option);
+ }
+ return this;
+ }
+
+ @Override
+ public MenuOption addOption(final int y, final MenuOption option) {
+ options.get(y).add(option);
+ return option;
+ }
+
+ @Override
+ public MenuOption addOption(final int x, final int y, MenuOption option) {
+ options.get(y).add(x, option);
+ return option;
+ }
+
+ @Override
+ public MenuGrid removeOption(final int x, final int y) {
+ final var row = options.get(y);
+ row.remove(x);
+ if (row.isEmpty()) {
+ options.remove(y);
+ }
+ return this;
+ }
+
  @Override
  public int hashCode() {
  return Objects.hashCode(options);

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
@@ -39,17 +39,23 @@ final class MenuManagerImpl extends AbstractTransformerWindowManager<MenuPane> i
 
  @Override
  protected void onWindowOpen(final SimpleWindow window) {
+ final var options = window.getPane().getGrid().getOptions().stream()
+ .map(row -> row.stream()
+ .map(MenuOption::getContent)
+ .map(content -> render(window, content))
+ .toArray(String[]::new))
+ .toArray(String[][]::new);
+ for (int i = 0; i < options.length; i++) {
+ if (options[i].length == 0) {
+ throw new IllegalArgumentException("Row " + i + " is empty");
+ }
+ }
  Call.followUpMenu(
  window.getViewer().con(),
  id,
  render(window, window.getPane().getTitle()),
  render(window, window.getPane().getContent()),
- window.getPane().getGrid().getOptions().stream()
- .map(row -> row.stream()
- .map(MenuOption::getContent)
- .map(content -> render(window, content))
- .toArray(String[]::new))
- .toArray(String[][]::new));
+ options);
  }
 
  @Override