Fix #3795 Prevent retaining the player client when crossing dimensions

Author: mezz

Common/src/main/java/mezz/jei/common/util/TagUtil.java

@@ -15,8 +15,7 @@ public class TagUtil {
 	public static <VALUE, STACK> Optional<TagKey<?>> getTagEquivalent(
 		Collection<STACK> stacks,
 		Function<STACK, VALUE> stackToValue,
-		Supplier<Stream<Pair<TagKey<VALUE>,
-		HolderSet.Named<VALUE>>>> tagSupplier
+		Supplier<Stream<Pair<TagKey<VALUE>, HolderSet.Named<VALUE>>>> tagSupplier
 	) {
 		List<VALUE> values = stacks.stream()
 			.map(stackToValue)

Gui/src/main/java/mezz/jei/gui/recipes/IRecipeGuiLogic.java

@@ -37,7 +37,7 @@ public interface IRecipeGuiLogic {
 
 	void nextPage();
 
-	void tick();
+	void tick(@Nullable AbstractContainerMenu container);
 
 	boolean showFocus(IFocusGroup focuses);
 

Gui/src/main/java/mezz/jei/gui/recipes/RecipeGuiLogic.java

@@ -40,6 +40,7 @@ public class RecipeGuiLogic implements IRecipeGuiLogic {
 	private final IFocusFactory focusFactory;
 	private @Nullable IRecipeCategory<?> cachedRecipeCategory;
 	private @Nullable IRecipeLayoutList cachedRecipeLayoutsWithButtons;
+	private int cachedContainerId = -1;
 	private Set<RecipeSorterStage> cachedSorterStages = Set.of();
 
 	public RecipeGuiLogic(
@@ -64,9 +65,9 @@ public RecipeGuiLogic(
 	}
 
 	@Override
-	public void tick() {
+	public void tick(@Nullable AbstractContainerMenu container) {
 		if (cachedRecipeLayoutsWithButtons != null) {
-			cachedRecipeLayoutsWithButtons.tick();
+			cachedRecipeLayoutsWithButtons.tick(container);
 		}
 	}
 
@@ -121,6 +122,7 @@ private boolean setState(ILookupState state, boolean saveHistory) {
 		this.initialState = false;
 		this.cachedRecipeCategory = null;
 		this.cachedRecipeLayoutsWithButtons = null;
+		this.cachedContainerId = -1;
 		stateListener.onStateChange();
 		return true;
 	}
@@ -204,9 +206,11 @@ public List<RecipeLayoutWithButtons<?>> getVisibleRecipeLayoutsWithButtons(
 		IClientConfig clientConfig = jeiClientConfigs.getClientConfig();
 		Set<RecipeSorterStage> recipeSorterStages = clientConfig.getRecipeSorterStages();
 
+		int containerId = container == null ? -1 : container.containerId;
 		if (!recipeSorterStages.equals(cachedSorterStages) ||
 			this.cachedRecipeLayoutsWithButtons == null ||
-			this.cachedRecipeCategory != recipeCategory
+			this.cachedRecipeCategory != recipeCategory ||
+			this.cachedContainerId != containerId
 		) {
 			IFocusedRecipes<?> focusedRecipes = this.state.getFocusedRecipes();
 
@@ -221,6 +225,7 @@ public List<RecipeLayoutWithButtons<?>> getVisibleRecipeLayoutsWithButtons(
 			);
 			this.cachedRecipeCategory = recipeCategory;
 			this.cachedSorterStages = Set.copyOf(recipeSorterStages);
+			this.cachedContainerId = containerId;
 		}
 
 		final int recipeHeight =

Gui/src/main/java/mezz/jei/gui/recipes/RecipesGui.java

@@ -351,7 +351,7 @@ public void tick() {
 
 		this.optionButtons.tick();
 
-		this.logic.tick();
+		this.logic.tick(container);
 	}
 
 	@Override
@@ -554,7 +554,7 @@ private ImmutableRect2i getRecipeLayoutsArea() {
 	}
 
 	@Nullable
-	private AbstractContainerMenu getParentContainerMenu() {
+	public AbstractContainerMenu getParentContainerMenu() {
 		Screen screen;
 		if (parentScreen == null) {
 			screen = Minecraft.getInstance().screen;

Gui/src/main/java/mezz/jei/gui/recipes/layouts/IRecipeLayoutList.java

@@ -41,5 +41,5 @@ static IRecipeLayoutList create(
 
 	Optional<RecipeLayoutWithButtons<?>> findFirst();
 
-	void tick();
+	void tick(@Nullable AbstractContainerMenu container);
 }

Gui/src/main/java/mezz/jei/gui/recipes/layouts/LazyRecipeLayoutList.java

@@ -30,7 +30,6 @@
 import java.util.Set;
 
 public class LazyRecipeLayoutList<T> implements IRecipeLayoutList {
-	private final @Nullable AbstractContainerMenu container;
 	private final IRecipeManager recipeManager;
 	private final IRecipeCategory<T> recipeCategory;
 	private final RecipesGui recipesGui;
@@ -55,7 +54,6 @@ public LazyRecipeLayoutList(
 		this.bookmarkList = bookmarkList;
 		boolean matchingBookmarks = recipeSorterStages.contains(RecipeSorterStage.BOOKMARKED);
 		boolean matchingCraftable = recipeSorterStages.contains(RecipeSorterStage.CRAFTABLE);
-		this.container = container;
 		this.recipeManager = recipeManager;
 		this.recipesGui = recipesGui;
 		this.focusGroup = focusGroup;
@@ -112,7 +110,11 @@ private IRecipeLayoutDrawable<T> createRecipeLayout(T recipe) {
 		return recipeManager.createRecipeLayoutDrawableOrShowError(recipeCategory, recipe, focusGroup);
 	}
 
-	private RecipeLayoutWithButtons<T> createRecipeLayoutWithButtons(IRecipeLayoutDrawable<T> recipeLayoutDrawable, IIngredientManager ingredientManager) {
+	private RecipeLayoutWithButtons<T> createRecipeLayoutWithButtons(
+		IRecipeLayoutDrawable<T> recipeLayoutDrawable,
+		IIngredientManager ingredientManager,
+		@Nullable AbstractContainerMenu container
+	) {
 		RecipeBookmark<T, ?> recipeBookmark = RecipeBookmark.create(recipeLayoutDrawable, ingredientManager);
 		return createRecipeLayoutWithButtons(recipeLayoutDrawable, recipeBookmark, bookmarkList, recipesGui, container);
 	}
@@ -129,8 +131,9 @@ public List<RecipeLayoutWithButtons<?>> subList(int from, int to) {
 	}
 
 	private void ensureResults(int index) {
+		AbstractContainerMenu container = recipesGui.getParentContainerMenu();
 		while (index >= results.size()) {
-			if (!calculateNextResult()) {
+			if (!calculateNextResult(container)) {
 				return;
 			}
 		}
@@ -146,18 +149,18 @@ public Optional<RecipeLayoutWithButtons<?>> findFirst() {
 	}
 
 	@Override
-	public void tick() {
-		calculateNextResult();
+	public void tick(@Nullable AbstractContainerMenu container) {
+		calculateNextResult(container);
 	}
 
-	private boolean calculateNextResult() {
+	private boolean calculateNextResult(@Nullable AbstractContainerMenu container) {
 		IJeiRuntime jeiRuntime = Internal.getJeiRuntime();
 		IIngredientManager ingredientManager = jeiRuntime.getIngredientManager();
 
 		while (unsortedIterator.hasNext()) {
 			T recipe = unsortedIterator.next();
 			IRecipeLayoutDrawable<T> recipeLayout = createRecipeLayout(recipe);
-			RecipeLayoutWithButtons<T> recipeLayoutWithButtons = createRecipeLayoutWithButtons(recipeLayout, ingredientManager);
+			RecipeLayoutWithButtons<T> recipeLayoutWithButtons = createRecipeLayoutWithButtons(recipeLayout, ingredientManager, container);
 			RecipeTransferButton transferButton = recipeLayoutWithButtons.transferButton();
 
 			if (matchingCraftable) {