From fc05f78a6304230b7eb9b49b8b6dea9545812cda Mon Sep 17 00:00:00 2001
From: DragonsAscent <drawnhorizons@outlook.com>
Date: Tue, 8 Sep 2026 20:26:13 -0400
Subject: [PATCH] feat: Add sorting options for menu items in MenuSpell

---
 .../nisovin/magicspells/spells/MenuSpell.java | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/nisovin/magicspells/spells/MenuSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/MenuSpell.java
index d2683161e..3e80503aa 100644
--- a/core/src/main/java/com/nisovin/magicspells/spells/MenuSpell.java
+++ b/core/src/main/java/com/nisovin/magicspells/spells/MenuSpell.java
@@ -132,6 +132,7 @@ public MenuSpell(MagicConfig config, String spellName) {
 			option.spellSwapName = getConfigString(path + "spell-swap", "");
 			option.power = getConfigFloat(path + "power", 1);
 			option.modifierList = getConfigStringList(path + "modifiers", null);
+			option.sortMode = SortMode.fromConfigValue(getConfigString(path + "sort-mode", "none"));
 			option.stayOpen = getConfigBoolean(path + "stay-open", false);
 			options.put(optionName, option);
 		}
@@ -293,9 +294,28 @@ private void applyOptionsToInventory(Player opener, MenuInventory menu) {
 			} else quantity = (int) Math.round(variable.getValue(opener));
 			item.setAmount(quantity);
 
-			// Set item for all defined slots.
-			for (int slot : option.slots) {
-				if (inv.getItem(slot) == null) inv.setItem(slot, item);
+			// Set item for the defined slots based on the configured fill behavior.
+			switch (option.sortMode) {
+				case FIRST -> {
+					for (int slot : option.slots) {
+						if (inv.getItem(slot) != null) continue;
+						inv.setItem(slot, item);
+						break;
+					}
+				}
+				case LAST -> {
+					for (int index = option.slots.size() - 1; index >= 0; index--) {
+						int slot = option.slots.get(index);
+						if (inv.getItem(slot) != null) continue;
+						inv.setItem(slot, item);
+						break;
+					}
+				}
+				case NONE -> {
+					for (int slot : option.slots) {
+						if (inv.getItem(slot) == null) inv.setItem(slot, item);
+					}
+				}
 			}
 		}
 		// Fill inventory.
@@ -434,6 +454,22 @@ private enum PostClickState {
 		IGNORE
 	}
 
+	private enum SortMode {
+		NONE,
+		FIRST,
+		LAST;
+
+		private static SortMode fromConfigValue(String value) {
+			if (value == null) return NONE;
+
+			return switch (value.toLowerCase()) {
+				case "first" -> FIRST;
+				case "last" -> LAST;
+				default -> NONE;
+			};
+		}
+	}
+
 	private static class MenuOption {
 
 		private String menuOptionName;
@@ -456,6 +492,7 @@ private static class MenuOption {
 		private float power;
 		private List<String> modifierList;
 		private ModifierSet menuOptionModifiers;
+		private SortMode sortMode;
 		private boolean stayOpen;
 
 	}