Item selector QoL and delete prompts.

Implements a basic delete confirm prompt so users don't delete groups in a single click.
Item Selector now remembers last search term and page, very useful for quickly and repeatedly adding groups.
Ctrl+F now focuses the search field.

Author: Rsslone

.gitignore

@@ -28,3 +28,4 @@ changelog.html
 \.project
 \.settings/
 *.launch
+/Reference

TODO.md

@@ -0,0 +1 @@
+# TODO

src/main/java/mezz/jei/gui/overlay/collapsible/GuiCollapsibleGroups.java

@@ -53,11 +53,15 @@ public class GuiCollapsibleGroups extends GuiScreen {
 	private static final int BTN_TOGGLE_BASE = 100;
 	private static final int BTN_CONFIGURE_BASE = 200;
 	private static final int BTN_DELETE_BASE = 300;
+	private static final int BTN_DELETE_CONFIRM_BASE = 400;
+	private static final int BTN_DELETE_CANCEL_BASE = 500;
 
 	private final GuiScreen parentScreen;
 	private final List<GroupCardEntry> cardEntries = new ArrayList<>();
 	private int currentPage = 0;
 	private int totalPages = 1;
+	/** Index into {@code cardEntries} of the custom group awaiting delete confirmation, or -1. */
+	private int pendingDeleteIdx = -1;
 	@Nullable private IIngredientListElement<?> tooltipElement = null;
 
 	// Drag-to-scroll state for card preview boxes
@@ -152,12 +156,20 @@ private void rebuildPageButtons() {
 			this.buttonList.add(new GuiButton(BTN_TOGGLE_BASE + i, btnX, btnY, 52, 20, toggleLabel));
 
 			if (card.isCustom) {
-				// Configure button
-				this.buttonList.add(new GuiButton(BTN_CONFIGURE_BASE + i, btnX, btnY + 22, 24, 20,
-					"\u270E")); // pencil unicode
-				// Delete button
-				this.buttonList.add(new GuiButton(BTN_DELETE_BASE + i, btnX + 26, btnY + 22, 26, 20,
-					"\u2716")); // cross unicode
+				if (i == pendingDeleteIdx) {
+					// Confirm row: ✔ Yes / ✗ No
+					this.buttonList.add(new GuiButton(BTN_DELETE_CONFIRM_BASE + i, btnX, btnY + 22, 24, 20,
+						"\u2714")); // ✔ checkmark
+					this.buttonList.add(new GuiButton(BTN_DELETE_CANCEL_BASE + i, btnX + 26, btnY + 22, 26, 20,
+						"\u2716")); // ✗ cancel
+				} else {
+					// Configure button
+					this.buttonList.add(new GuiButton(BTN_CONFIGURE_BASE + i, btnX, btnY + 22, 24, 20,
+						"\u270E")); // pencil unicode
+					// Delete button
+					this.buttonList.add(new GuiButton(BTN_DELETE_BASE + i, btnX + 26, btnY + 22, 26, 20,
+						"\u2716")); // cross unicode
+				}
 			}
 		}
 
@@ -186,11 +198,13 @@ protected void actionPerformed(GuiButton button) throws IOException {
 		}
 		if (button.id == BTN_PREV_PAGE) {
 			currentPage = Math.max(0, currentPage - 1);
+			pendingDeleteIdx = -1;
 			rebuildPageButtons();
 			return;
 		}
 		if (button.id == BTN_NEXT_PAGE) {
 			currentPage = Math.min(totalPages - 1, currentPage + 1);
+			pendingDeleteIdx = -1;
 			rebuildPageButtons();
 			return;
 		}
@@ -244,9 +258,20 @@ protected void actionPerformed(GuiButton button) throws IOException {
 			return;
 		}
 
-		// Delete
-		if (button.id >= BTN_DELETE_BASE) {
+		// Delete — first click: arm confirmation
+		if (button.id >= BTN_DELETE_BASE && button.id < BTN_DELETE_CONFIRM_BASE) {
 			int idx = button.id - BTN_DELETE_BASE;
+			if (idx >= 0 && idx < cardEntries.size() && cardEntries.get(idx).isCustom) {
+				pendingDeleteIdx = idx;
+				rebuildPageButtons();
+			}
+			return;
+		}
+
+		// Delete confirmed — execute the actual removal
+		if (button.id >= BTN_DELETE_CONFIRM_BASE && button.id < BTN_DELETE_CANCEL_BASE) {
+			int idx = button.id - BTN_DELETE_CONFIRM_BASE;
+			pendingDeleteIdx = -1;
 			if (idx >= 0 && idx < cardEntries.size()) {
 				GroupCardEntry card = cardEntries.get(idx);
 				if (card.isCustom) {
@@ -267,6 +292,13 @@ protected void actionPerformed(GuiButton button) throws IOException {
 					}
 				}
 			}
+			return;
+		}
+
+		// Delete cancelled
+		if (button.id >= BTN_DELETE_CANCEL_BASE) {
+			pendingDeleteIdx = -1;
+			rebuildPageButtons();
 		}
 	}
 
@@ -290,6 +322,15 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 			int cardY = layoutContentTop + row * (CARD_HEIGHT + CARD_PADDING);
 			GroupCardEntry card = cardEntries.get(i);
 			drawCard(card, cardX, cardY, layoutColWidth, mouseX, mouseY);
+
+			// Draw "Delete?" label to the left of the ✔/✗ confirm buttons
+			if (i == pendingDeleteIdx && card.isCustom) {
+				int btnX = cardX + layoutColWidth - 56;
+				int btnY = cardY + 4;
+				String confirmLabel = Translator.translateToLocal("jei.gui.collapsible.confirmDelete");
+				int labelX = btnX - this.fontRenderer.getStringWidth(confirmLabel) - 3;
+				this.fontRenderer.drawStringWithShadow(confirmLabel, labelX, btnY + 27, 0xFFFF4444);
+			}
 		}
 
 		// Page counter

src/main/java/mezz/jei/gui/overlay/collapsible/GuiCustomGroupEditor.java

@@ -46,6 +46,10 @@ public class GuiCustomGroupEditor extends GuiScreen {
 	private final CustomGroupsConfig.CustomGroup group;
 	private final Set<String> selectedUids = new LinkedHashSet<>();
 
+	// Persisted across editor instances, reopening restores last search and page.
+	private static String savedSearchText = "";
+	private static int savedFirstItemIndex = 0;
+
 	@Nullable
 	private GuiTextField nameField;
 	@Nullable
@@ -108,10 +112,10 @@ public void initGui() {
 		nameField.setMaxStringLength(40);
 		nameField.setText(group.displayName != null ? group.displayName : "");
 
-		// Search field
+		// Search field — restore saved text so the user's last search carries over
 		searchField = new GuiTextField(11, this.fontRenderer, 4, topBarHeight - 18, panelDivider - 12, 14);
 		searchField.setMaxStringLength(128);
-		searchField.setText("");
+		searchField.setText(savedSearchText);
 
 		// Save & Cancel buttons
 		this.buttonList.add(new GuiButton(BTN_SAVE, panelDivider + 4, 4, 50, 20,
@@ -147,6 +151,7 @@ public void initGui() {
 		this.buttonList.add(new GuiButton(BTN_NEXT_SEL_PAGE, this.width - 34, leftNavY, 30, 20, ">"));
 
 		updateFilteredItems();
+		leftPage = Math.max(0, Math.min(savedFirstItemIndex / leftItemsPerPage, leftTotalPages - 1));
 		updateSelectedStacks();
 		buildOtherGroupIndex();
 	}
@@ -155,6 +160,9 @@ public void initGui() {
 	public void onGuiClosed() {
 		super.onGuiClosed();
 		Keyboard.enableRepeatEvents(false);
+		// Persist the current search text and the absolute index of the first visible item.
+		savedSearchText = (searchField != null) ? searchField.getText() : "";
+		savedFirstItemIndex = leftPage * leftItemsPerPage;
 	}
 
 	/**
@@ -262,7 +270,6 @@ private String findCoveringWildcard(String normalUid) {
 	/**
 	 * Collects all exact UIDs from the full ingredient list that share the given wildcard prefix.
 	 * Used for auto-promote checks and wildcard decomposition.
-	 * Mirrors the sibling-lookup from the legacy blacklist's areAllBlacklisted / getMatches logic.
 	 */
 	private List<String> getSiblingUids(String wildcardUid) {
 		if (!wildcardUid.endsWith(":*") || !Internal.hasIngredientFilter()) return Collections.emptyList();
@@ -281,7 +288,6 @@ private List<String> getSiblingUids(String wildcardUid) {
 	/**
 	 * Decomposes a wildcard entry into individual exact entries, excluding one item
 	 * (the one the user just clicked to remove).
-	 * Mirrors removeIngredientFromConfigBlacklist's wildcard-decompose behaviour.
 	 */
 	private void decomposeWildcard(String wildcardUid, @Nullable String excludeUid) {
 		selectedUids.remove(wildcardUid);
@@ -296,7 +302,6 @@ private void decomposeWildcard(String wildcardUid, @Nullable String excludeUid)
 	/**
 	 * After adding an exact UID, checks if every meta variant of that item is now individually
 	 * selected. If so, replaces them all with a single wildcard entry.
-	 * Mirrors addIngredientToConfigBlacklist's auto-promote (areAllBlacklisted) behaviour.
 	 */
 	private void maybePromoteToWildcard(Object ingredient, String addedUid) {
 		String wildcardUid = getIngredientWildcardUid(ingredient);
@@ -689,6 +694,7 @@ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOEx
 			// Right-click clears search
 			if (searchField.isFocused() && mouseButton == 1) {
 				searchField.setText("");
+				leftPage = 0;
 				updateFilteredItems();
 			}
 		}
@@ -877,10 +883,24 @@ protected void keyTyped(char typedChar, int keyCode) throws IOException {
 			return;
 		}
 		if (searchField != null && searchField.isFocused()) {
+			String before = searchField.getText();
 			searchField.textboxKeyTyped(typedChar, keyCode);
+			if (!searchField.getText().equals(before)) {
+				leftPage = 0;
+			}
 			updateFilteredItems();
 			return;
 		}
+		// Ctrl+F focuses the search field
+		if (keyCode == Keyboard.KEY_F && isCtrlKeyDown()) {
+			if (searchField != null) {
+				searchField.setFocused(true);
+				if (nameField != null) {
+					nameField.setFocused(false);
+				}
+			}
+			return;
+		}
 		if (keyCode == Keyboard.KEY_ESCAPE) {
 			this.mc.displayGuiScreen(parentScreen);
 			return;

src/main/resources/assets/jei/lang/en_us.lang

@@ -233,4 +233,5 @@ jei.gui.collapsible.editor.title=Selected Items
 jei.gui.collapsible.editor.name=Name
 jei.gui.collapsible.editor.save=Save
 jei.gui.collapsible.editor.selected=%d selected
+jei.gui.collapsible.confirmDelete=Delete?
 hei.tooltip.missing_ingredients=§cMissing Ingredients: