Optimize by caching unsupported containers that throw on getType()

mezz · Oct 3, 2024 · 601e452 · 601e452
1 parent e10b47c
commit 601e452
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/Library/src/main/java/mezz/jei/library/recipes/RecipeTransferManager.java b/Library/src/main/java/mezz/jei/library/recipes/RecipeTransferManager.java
@@ -11,10 +11,13 @@
 import net.minecraft.world.inventory.MenuType;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.Set;
 
 public class RecipeTransferManager implements IRecipeTransferManager {
 	private final ImmutableTable<Class<? extends AbstractContainerMenu>, RecipeType<?>, IRecipeTransferHandler<?, ?>> recipeTransferHandlers;
+	private final Set<AbstractContainerMenu> unsupportedContainers = new HashSet<>();
 
 	public RecipeTransferManager(ImmutableTable<Class<? extends AbstractContainerMenu>, RecipeType<?>, IRecipeTransferHandler<?, ?>> recipeTransferHandlers) {
 		this.recipeTransferHandlers = recipeTransferHandlers;
@@ -39,25 +42,30 @@ public <C extends AbstractContainerMenu, R> Optional<IRecipeTransferHandler<C, R
 
 	@Nullable
 	private <C extends AbstractContainerMenu> MenuType<C> getMenuType(C container) {
+		if (unsupportedContainers.contains(container)) {
+			return null;
+		}
 		try {
 			@SuppressWarnings({"UnnecessaryLocalVariable", "unchecked"})
 			MenuType<C> cast = (MenuType<C>) container.getType();
 			return cast;
 		} catch (UnsupportedOperationException ignored) {
+			unsupportedContainers.add(container);
 			return null;
 		}
 	}
 
 	private <C extends AbstractContainerMenu, R> Optional<IRecipeTransferHandler<C, R>> getHandler(Class<? extends C> containerClass, @Nullable MenuType<C> menuType, RecipeType<?> recipeType) {
-		return Optional.ofNullable(recipeTransferHandlers.get(containerClass, recipeType))
-			.filter(handler -> {
-				Optional<? extends MenuType<?>> handlerMenuType = handler.getMenuType();
-				return handlerMenuType.isEmpty() || handlerMenuType.get().equals(menuType);
-			})
-			.flatMap(handler -> {
-				@SuppressWarnings("unchecked")
-				IRecipeTransferHandler<C, R> cast = (IRecipeTransferHandler<C, R>) handler;
-				return Optional.of(cast);
-			});
+		IRecipeTransferHandler<?, ?> handler = recipeTransferHandlers.get(containerClass, recipeType);
+		if (handler == null) {
+			return Optional.empty();
+		}
+		Optional<? extends MenuType<?>> handlerMenuType = handler.getMenuType();
+		if (handlerMenuType.isEmpty() || handlerMenuType.get().equals(menuType)) {
+			@SuppressWarnings("unchecked")
+			IRecipeTransferHandler<C, R> cast = (IRecipeTransferHandler<C, R>) handler;
+			return Optional.of(cast);
+		}
+		return Optional.empty();
 	}
 }