Set ingredient list to the first page when toggling edit mode

mezz · Nov 12, 2016 · 00a201b · 00a201b
1 parent fdd43c9
commit 00a201b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/mezz/jei/ProxyCommonClient.java b/src/main/java/mezz/jei/ProxyCommonClient.java
@@ -138,8 +138,7 @@ private static void reloadItemList() {
 		JeiRuntime runtime = Internal.getRuntime();
 		if (runtime != null) {
 			ItemListOverlay itemListOverlay = runtime.getItemListOverlay();
-			ItemFilter itemFilter = itemListOverlay.getItemFilter();
-			itemFilter.rebuild();
+			itemListOverlay.rebuildItemFilter();
 		}
 	}
 

diff --git a/src/main/java/mezz/jei/gui/ItemListOverlay.java b/src/main/java/mezz/jei/gui/ItemListOverlay.java
@@ -77,6 +77,15 @@ public void setFilterText(@Nullable String filterText) {
 		}
 	}
 
+	public void rebuildItemFilter() {
+		ItemFilter itemFilter = getItemFilter();
+		itemFilter.rebuild();
+		ItemListOverlayInternal.setToFirstPage();
+		if (internal != null) {
+			internal.updateLayout();
+		}
+	}
+
 	@Override
 	public String getFilterText() {
 		return Config.getFilterText();

diff --git a/src/main/java/mezz/jei/gui/ItemListOverlayInternal.java b/src/main/java/mezz/jei/gui/ItemListOverlayInternal.java
@@ -232,7 +232,7 @@ private static boolean intersects(List<Rectangle> areas, Rectangle comparisonAre
 		return false;
 	}
 
-	private void updateLayout() {
+	public void updateLayout() {
 		ImmutableList<IIngredientListElement> ingredientList = parent.getItemFilter().getIngredientList();
 		guiIngredientList.set(firstItemIndex, ingredientList);
 
@@ -556,11 +556,15 @@ public ItemStack getStackUnderMouse() {
 	}
 
 	public void setFilterText(String filterText) {
-		firstItemIndex = 0;
 		searchField.setText(filterText);
+		setToFirstPage();
 		updateLayout();
 	}
 
+	public static void setToFirstPage() {
+		firstItemIndex = 0;
+	}
+
 	public ImmutableList<ItemStack> getVisibleStacks() {
 		ImmutableList.Builder<ItemStack> visibleStacks = ImmutableList.builder();
 		for (GuiIngredientFast guiItemStack : guiIngredientList.getAllGuiIngredients()) {