allow both position and slot settings

Author: HSGamer

src/main/java/me/hsgamer/bettergui/menu/SimpleMenu.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.menu;
 
+import io.github.projectunified.craftux.common.Button;
 import io.github.projectunified.craftux.simple.SimpleButtonMask;
 import io.github.projectunified.craftux.spigot.SpigotInventoryUtil;
 import me.hsgamer.bettergui.BetterGUI;
@@ -10,6 +11,7 @@
 import me.hsgamer.hscore.config.Config;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 public class SimpleMenu extends BaseInventoryMenu<SimpleButtonMask> {
@@ -27,9 +29,13 @@ protected SimpleButtonMask createMask(Map<String, Object> sectionMap) {
         continue;
       }
       Map<String, Object> values = MapUtils.createLowercaseStringObjectMap((Map<?, ?>) value);
-      BetterGUI.getInstance().get(ButtonBuilder.class)
-        .build(new ButtonBuilder.Input(this, "button_" + key, values))
-        .ifPresent(button -> SlotUtil.getSlots(values).forEach(slot -> mask.setButton(SpigotInventoryUtil.toPosition(slot, getInventoryType()), button)));
+      Optional<WrappedButton> optionalButton = BetterGUI.getInstance().get(ButtonBuilder.class).build(new ButtonBuilder.Input(this, "button_" + key, values));
+      if (!optionalButton.isPresent()) {
+        continue;
+      }
+      Button button = optionalButton.get();
+      SlotUtil.getPosition(values).ifPresent(position -> mask.setButton(position, button));
+      SlotUtil.getSlot(values).forEach(slot -> mask.setButton(SpigotInventoryUtil.toPosition(slot, getInventoryType()), button));
     }
     return mask;
   }

src/main/java/me/hsgamer/bettergui/util/SlotUtil.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.util;
 
+import io.github.projectunified.craftux.common.Position;
 import me.hsgamer.hscore.common.Validate;
 
 import java.math.BigDecimal;
@@ -21,28 +22,35 @@ private SlotUtil() {
   }
 
   /**
-   * Get the slots
+   * Get the position from the settings
    *
-   * @param map the value map
+   * @param map the settings
    *
-   * @return the slots
+   * @return the position
    */
-  public static IntStream getSlots(Map<String, Object> map) {
-    IntStream slots = IntStream.empty();
-
+  public static Optional<Position> getPosition(Map<String, Object> map) {
     if (map.containsKey(POS_X) || map.containsKey(POS_Y)) {
       Optional<Integer> x = Validate.getNumber(String.valueOf(map.get(POS_X))).map(BigDecimal::intValue);
       Optional<Integer> y = Validate.getNumber(String.valueOf(map.get(POS_Y))).map(BigDecimal::intValue);
       if (x.isPresent() && y.isPresent()) {
-        slots = IntStream.of((y.get() - 1) * 9 + x.get() - 1);
+        return Optional.of(Position.of(x.get(), y.get()));
       }
     }
+    return Optional.empty();
+  }
 
+  /**
+   * Get the slots from the settings
+   *
+   * @param map the settings
+   *
+   * @return the slots
+   */
+  public static IntStream getSlot(Map<String, Object> map) {
     if (map.containsKey(POS_SLOT)) {
-      slots = IntStream.concat(slots, generateSlots(String.valueOf(map.get(POS_SLOT))));
+      return generateSlots(String.valueOf(map.get(POS_SLOT)));
     }
-
-    return slots;
+    return IntStream.empty();
   }
 
   /**