Prevent displaying invisible focus-linked slots

mezz · Oct 8, 2024 · e5bf20b · e5bf20b
1 parent 3efb0e2
commit e5bf20b
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Library/src/main/java/mezz/jei/library/gui/recipes/layout/builder/RecipeLayoutBuilder.java b/Library/src/main/java/mezz/jei/library/gui/recipes/layout/builder/RecipeLayoutBuilder.java
@@ -38,7 +38,7 @@
 import java.util.Set;
 
 public class RecipeLayoutBuilder<T> implements IRecipeLayoutBuilder {
-	private final List<RecipeSlotBuilder> slots = new ArrayList<>();
+	private final List<RecipeSlotBuilder> visibleSlots = new ArrayList<>();
 	private final List<List<RecipeSlotBuilder>> focusLinkedSlots = new ArrayList<>();
 
 	private final IIngredientManager ingredientManager;
@@ -66,7 +66,7 @@ public IRecipeSlotBuilder addSlot(RecipeIngredientRole role) {
 			addOutputSlotTooltipCallback(slot);
 		}
 
-		this.slots.add(slot);
+		this.visibleSlots.add(slot);
 		return slot;
 	}
 
@@ -81,7 +81,7 @@ public IRecipeSlotBuilder addSlotToWidget(RecipeIngredientRole role, mezz.jei.ap
 			addOutputSlotTooltipCallback(slot);
 		}
 
-		this.slots.add(slot);
+		this.visibleSlots.add(slot);
 		return slot;
 	}
 
@@ -173,6 +173,9 @@ public RecipeLayout<T> buildRecipeLayout(
 				focusMatches.addAll(slot.getMatches(focuses));
 			}
 			for (RecipeSlotBuilder slotBuilder : linkedSlots) {
+				if (!visibleSlots.contains(slotBuilder)) {
+					continue;
+				}
 				mezz.jei.api.gui.widgets.ISlottedWidgetFactory<?> assignedWidget = slotBuilder.getAssignedWidget();
 				Pair<Integer, IRecipeSlotDrawable> slotDrawable = slotBuilder.build(focusMatches, cycleTicker);
 				if (assignedWidget == null) {
@@ -185,7 +188,7 @@ public RecipeLayout<T> buildRecipeLayout(
 			focusLinkedSlots.addAll(linkedSlots);
 		}
 
-		for (RecipeSlotBuilder slotBuilder : slots) {
+		for (RecipeSlotBuilder slotBuilder : visibleSlots) {
 			if (!focusLinkedSlots.contains(slotBuilder)) {
 				mezz.jei.api.gui.widgets.ISlottedWidgetFactory<?> assignedWidget = slotBuilder.getAssignedWidget();
 				Pair<Integer, IRecipeSlotDrawable> slotDrawable = slotBuilder.build(focuses, cycleTicker);