Add convenience functions to reduce the need for using VanillaTypes.I…

…TEM_STACK
mezz · Jul 27, 2022 · 66a18cc · 66a18cc
1 parent 4f0c07e
commit 66a18cc
Show file tree

Hide file tree

Showing 34 changed files with 261 additions and 53 deletions.
diff --git a/Common/src/main/java/mezz/jei/common/gui/GuiScreenHelper.java b/Common/src/main/java/mezz/jei/common/gui/GuiScreenHelper.java
@@ -1,6 +1,5 @@
 package mezz.jei.common.gui;
 
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.handlers.IGhostIngredientHandler;
 import mezz.jei.api.gui.handlers.IGlobalGuiHandler;
 import mezz.jei.api.gui.handlers.IGuiClickableArea;
@@ -171,7 +170,7 @@ public static <T> ImmutableRect2i getSlotArea(ITypedIngredient<T> typedIngredien
 		if (slotUnderMouse == null) {
 			return null;
 		}
-		return typedIngredient.getIngredient(VanillaTypes.ITEM_STACK)
+		return typedIngredient.getItemStack()
 			.filter(i -> ItemStack.matches(slotUnderMouse.getItem(), i))
 			.map(i ->
 				new ImmutableRect2i(

diff --git a/Common/src/main/java/mezz/jei/common/input/UserInput.java b/Common/src/main/java/mezz/jei/common/input/UserInput.java
@@ -7,7 +7,6 @@
 import net.minecraft.SharedConstants;
 import net.minecraft.client.KeyMapping;
 
-import java.util.Collection;
 import java.util.Optional;
 
 public class UserInput {

diff --git a/Common/src/main/java/mezz/jei/common/load/registration/SubtypeRegistration.java b/Common/src/main/java/mezz/jei/common/load/registration/SubtypeRegistration.java
@@ -1,6 +1,5 @@
 package mezz.jei.common.load.registration;
 
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.ingredients.IIngredientTypeWithSubtypes;
 import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
 import mezz.jei.api.ingredients.subtypes.UidContext;
@@ -24,7 +23,7 @@ public class SubtypeRegistration implements ISubtypeRegistration {
 	@Override
 	public void useNbtForSubtypes(Item... items) {
 		for (Item item : items) {
-			registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, item, AllNbt.INSTANCE);
+			registerSubtypeInterpreter(item, AllNbt.INSTANCE);
 		}
 	}
 

diff --git a/Common/src/main/java/mezz/jei/common/plugins/debug/DebugRecipeCategory.java b/Common/src/main/java/mezz/jei/common/plugins/debug/DebugRecipeCategory.java
@@ -4,7 +4,6 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.constants.ModIds;
 import mezz.jei.api.constants.RecipeTypes;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
@@ -66,7 +65,7 @@ public DebugRecipeCategory(IGuiHelper guiHelper, IPlatformFluidHelper<F> platfor
 		ResourceLocation backgroundTexture = new ResourceLocation(ModIds.JEI_ID, Constants.TEXTURE_GUI_PATH + "debug.png");
 		this.tankBackground = guiHelper.createDrawable(backgroundTexture, 220, 196, 18, 60);
 		this.tankOverlay = guiHelper.createDrawable(backgroundTexture, 238, 196, 18, 60);
-		this.item = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(Items.ACACIA_LEAVES));
+		this.item = guiHelper.createDrawableItemStack(new ItemStack(Items.ACACIA_LEAVES));
 	}
 
 	@Override

diff --git a/Common/src/main/java/mezz/jei/common/plugins/debug/JeiDebugPlugin.java b/Common/src/main/java/mezz/jei/common/plugins/debug/JeiDebugPlugin.java
@@ -3,7 +3,6 @@
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.constants.ModIds;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.handlers.IGuiContainerHandler;
 import mezz.jei.api.helpers.IGuiHelper;
 import mezz.jei.api.helpers.IJeiHelpers;
@@ -82,15 +81,14 @@ public void registerRecipes(IRecipeRegistration registration) {
 		JeiDebugPlugin.ingredientManager = registration.getIngredientManager();
 
 		if (ClientConfig.getInstance().isDebugModeEnabled()) {
-			registration.addIngredientInfo(List.of(
+			registration.addItemStackInfo(List.of(
 				new ItemStack(Blocks.OAK_DOOR),
 				new ItemStack(Blocks.SPRUCE_DOOR),
 				new ItemStack(Blocks.BIRCH_DOOR),
 				new ItemStack(Blocks.JUNGLE_DOOR),
 				new ItemStack(Blocks.ACACIA_DOOR),
 				new ItemStack(Blocks.DARK_OAK_DOOR)
 				),
-				VanillaTypes.ITEM_STACK,
 				Component.translatable("description.jei.wooden.door.1"), // actually 2 lines
 				Component.translatable("description.jei.wooden.door.2"),
 				Component.translatable("description.jei.wooden.door.3")
@@ -199,7 +197,7 @@ private <T> void registerRecipeCatalysts(IRecipeCatalystRegistration registratio
 
 		registration.addRecipeCatalyst(DebugIngredient.TYPE, new DebugIngredient(7), DebugRecipeCategory.TYPE);
 		registration.addRecipeCatalyst(fluidHelper.getFluidIngredientType(), fluidHelper.create(Fluids.WATER, bucketVolume, null), DebugRecipeCategory.TYPE);
-		registration.addRecipeCatalyst(VanillaTypes.ITEM_STACK, new ItemStack(Items.STICK), DebugRecipeCategory.TYPE);
+		registration.addRecipeCatalyst(new ItemStack(Items.STICK), DebugRecipeCategory.TYPE);
 		IPlatformRegistry<Item> registry = Services.PLATFORM.getRegistry(Registry.ITEM_REGISTRY);
 		registry.getValues()
 			.limit(30)

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/VanillaPlugin.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/VanillaPlugin.java
@@ -135,11 +135,11 @@ public ResourceLocation getPluginUid() {
 
 	@Override
 	public void registerItemSubtypes(ISubtypeRegistration registration) {
-		registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, Items.TIPPED_ARROW, PotionSubtypeInterpreter.INSTANCE);
-		registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, Items.POTION, PotionSubtypeInterpreter.INSTANCE);
-		registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, Items.SPLASH_POTION, PotionSubtypeInterpreter.INSTANCE);
-		registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, Items.LINGERING_POTION, PotionSubtypeInterpreter.INSTANCE);
-		registration.registerSubtypeInterpreter(VanillaTypes.ITEM_STACK, Items.ENCHANTED_BOOK, (itemStack, context) -> {
+		registration.registerSubtypeInterpreter(Items.TIPPED_ARROW, PotionSubtypeInterpreter.INSTANCE);
+		registration.registerSubtypeInterpreter(Items.POTION, PotionSubtypeInterpreter.INSTANCE);
+		registration.registerSubtypeInterpreter(Items.SPLASH_POTION, PotionSubtypeInterpreter.INSTANCE);
+		registration.registerSubtypeInterpreter(Items.LINGERING_POTION, PotionSubtypeInterpreter.INSTANCE);
+		registration.registerSubtypeInterpreter(Items.ENCHANTED_BOOK, (itemStack, context) -> {
 			List<String> enchantmentNames = new ArrayList<>();
 			ListTag enchantments = EnchantedBookItem.getEnchantments(itemStack);
 			for (int i = 0; i < enchantments.size(); ++i) {

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/anvil/AnvilRecipeCategory.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/anvil/AnvilRecipeCategory.java
@@ -2,10 +2,10 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.constants.RecipeTypes;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.builder.IRecipeSlotBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
+import mezz.jei.api.gui.ingredient.IRecipeSlotView;
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
 import mezz.jei.api.helpers.IGuiHelper;
 import mezz.jei.api.recipe.IFocusGroup;
@@ -20,7 +20,6 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Blocks;
-
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -36,7 +35,7 @@ public AnvilRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.drawableBuilder(Constants.RECIPE_GUI_VANILLA, 0, 168, 125, 18)
 			.addPadding(0, 20, 0, 0)
 			.build();
-		icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(Blocks.ANVIL));
+		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.ANVIL));
 	}
 
 	@Override
@@ -90,10 +89,10 @@ public void setRecipe(IRecipeLayoutBuilder builder, IJeiAnvilRecipe recipe, IFoc
 	@Override
 	public void draw(IJeiAnvilRecipe recipe, IRecipeSlotsView recipeSlotsView, PoseStack poseStack, double mouseX, double mouseY) {
 		Optional<ItemStack> leftStack = recipeSlotsView.findSlotByName(leftSlotName)
-			.flatMap(slot1 -> slot1.getDisplayedIngredient(VanillaTypes.ITEM_STACK));
+			.flatMap(IRecipeSlotView::getDisplayedItemStack);
 
 		Optional<ItemStack> rightStack = recipeSlotsView.findSlotByName(rightSlotName)
-			.flatMap(slot -> slot.getDisplayedIngredient(VanillaTypes.ITEM_STACK));
+			.flatMap(IRecipeSlotView::getDisplayedItemStack);
 
 		if (leftStack.isEmpty() || rightStack.isEmpty()) {
 			return;

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/anvil/AnvilRecipeMaker.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/anvil/AnvilRecipeMaker.java
@@ -1,6 +1,5 @@
 package mezz.jei.common.plugins.vanilla.anvil;
 
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.recipe.vanilla.IJeiAnvilRecipe;
 import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory;
 import mezz.jei.api.runtime.IIngredientManager;
@@ -90,7 +89,7 @@ private static Stream<IJeiAnvilRecipe> getBookEnchantmentRecipes(
 			.map(EnchantmentData::new)
 			.toList();
 
-		return ingredientManager.getAllIngredients(VanillaTypes.ITEM_STACK)
+		return ingredientManager.getAllItemStacks()
 			.stream()
 			.filter(ItemStack::isEnchantable)
 			.flatMap(ingredient -> getBookEnchantmentRecipes(vanillaRecipeFactory, enchantmentDatas, ingredient));

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/anvil/SmithingRecipeCategory.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/anvil/SmithingRecipeCategory.java
@@ -1,7 +1,6 @@
 package mezz.jei.common.plugins.vanilla.anvil;
 
 import mezz.jei.api.constants.RecipeTypes;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.helpers.IGuiHelper;
@@ -24,7 +23,7 @@ public class SmithingRecipeCategory implements IRecipeCategory<UpgradeRecipe> {
 
 	public SmithingRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.createDrawable(Constants.RECIPE_GUI_VANILLA, 0, 168, 125, 18);
-		icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(Blocks.SMITHING_TABLE));
+		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.SMITHING_TABLE));
 	}
 
 	@Override

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/brewing/BrewingRecipeCategory.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/brewing/BrewingRecipeCategory.java
@@ -2,7 +2,6 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.constants.RecipeTypes;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.ITickTimer;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
@@ -38,7 +37,7 @@ public BrewingRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.drawableBuilder(location, 0, 0, 64, 60)
 			.addPadding(1, 0, 0, 50)
 			.build();
-		icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(Blocks.BREWING_STAND));
+		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.BREWING_STAND));
 		localizedName = Component.translatable("gui.jei.category.brewing");
 
 		arrow = guiHelper.drawableBuilder(location, 64, 0, 9, 28)

diff --git a/.../src/main/java/mezz/jei/common/plugins/vanilla/compostable/CompostableRecipeCategory.java b/.../src/main/java/mezz/jei/common/plugins/vanilla/compostable/CompostableRecipeCategory.java
@@ -2,15 +2,14 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.constants.RecipeTypes;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
 import mezz.jei.api.helpers.IGuiHelper;
 import mezz.jei.api.recipe.IFocusGroup;
 import mezz.jei.api.recipe.RecipeIngredientRole;
-import mezz.jei.api.recipe.category.IRecipeCategory;
 import mezz.jei.api.recipe.RecipeType;
+import mezz.jei.api.recipe.category.IRecipeCategory;
 import mezz.jei.api.recipe.vanilla.IJeiCompostingRecipe;
 import mezz.jei.common.util.Translator;
 import net.minecraft.client.Minecraft;
@@ -31,7 +30,7 @@ public class CompostableRecipeCategory implements IRecipeCategory<IJeiComposting
 	public CompostableRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.createBlankDrawable(width, height);
 		slot = guiHelper.getSlotDrawable();
-		icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(Blocks.COMPOSTER));
+		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.COMPOSTER));
 		localizedName = Component.translatable("gui.jei.category.compostable");
 	}
 

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/compostable/CompostingRecipeMaker.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/compostable/CompostingRecipeMaker.java
@@ -1,7 +1,6 @@
 package mezz.jei.common.plugins.vanilla.compostable;
 
 import it.unimi.dsi.fastutil.objects.Object2FloatMap;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.recipe.vanilla.IJeiCompostingRecipe;
 import mezz.jei.api.runtime.IIngredientManager;
 import net.minecraft.world.item.Item;
@@ -16,7 +15,7 @@
 public class CompostingRecipeMaker {
 	public static List<IJeiCompostingRecipe> getRecipes(IIngredientManager ingredientManager) {
 		Object2FloatMap<ItemLike> compostables = ComposterBlock.COMPOSTABLES;
-		Collection<ItemStack> allIngredients = ingredientManager.getAllIngredients(VanillaTypes.ITEM_STACK);
+		Collection<ItemStack> allIngredients = ingredientManager.getAllItemStacks();
 
 		return allIngredients.stream()
 			.<IJeiCompostingRecipe>mapMulti((itemStack, consumer) -> {

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/cooking/AbstractCookingCategory.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/cooking/AbstractCookingCategory.java
@@ -4,7 +4,6 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.mojang.blaze3d.vertex.PoseStack;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.gui.drawable.IDrawableAnimated;
@@ -33,7 +32,7 @@ public AbstractCookingCategory(IGuiHelper guiHelper, Block icon, String translat
 		super(guiHelper);
 		this.background = guiHelper.createDrawable(Constants.RECIPE_GUI_VANILLA, 0, 114, 82, 54);
 		this.regularCookTime = regularCookTime;
-		this.icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(icon));
+		this.icon = guiHelper.createDrawableItemStack(new ItemStack(icon));
 		this.localizedName = Component.translatable(translationKey);
 		this.cachedArrows = CacheBuilder.newBuilder()
 			.maximumSize(25)

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/cooking/fuel/FuelRecipeMaker.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/cooking/fuel/FuelRecipeMaker.java
@@ -1,6 +1,5 @@
 package mezz.jei.common.plugins.vanilla.cooking.fuel;
 
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.recipe.vanilla.IJeiFuelingRecipe;
 import mezz.jei.api.runtime.IIngredientManager;
 import mezz.jei.common.platform.IPlatformItemStackHelper;
@@ -16,7 +15,7 @@ private FuelRecipeMaker() {
 
 	public static List<IJeiFuelingRecipe> getFuelRecipes(IIngredientManager ingredientManager) {
 		IPlatformItemStackHelper itemStackHelper = Services.PLATFORM.getItemStackHelper();
-		return ingredientManager.getAllIngredients(VanillaTypes.ITEM_STACK).stream()
+		return ingredientManager.getAllItemStacks().stream()
 			.<IJeiFuelingRecipe>mapMulti((stack, consumer) -> {
 				int burnTime = itemStackHelper.getBurnTime(stack);
 				if (burnTime > 0) {

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/crafting/CraftingCategoryExtension.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/crafting/CraftingCategoryExtension.java
@@ -1,6 +1,5 @@
 package mezz.jei.common.plugins.vanilla.crafting;
 
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.ingredient.ICraftingGridHelper;
 import mezz.jei.api.recipe.IFocusGroup;
@@ -30,8 +29,8 @@ public void setRecipe(IRecipeLayoutBuilder builder, ICraftingGridHelper crafting
 
 		int width = getWidth();
 		int height = getHeight();
-		craftingGridHelper.createAndSetOutputs(builder, VanillaTypes.ITEM_STACK, List.of(resultItem));
-		craftingGridHelper.createAndSetInputs(builder, VanillaTypes.ITEM_STACK, inputs, width, height);
+		craftingGridHelper.createAndSetOutputs(builder, List.of(resultItem));
+		craftingGridHelper.createAndSetInputs(builder, inputs, width, height);
 	}
 
 	@Nullable

diff --git a/Common/src/main/java/mezz/jei/common/plugins/vanilla/crafting/CraftingRecipeCategory.java b/Common/src/main/java/mezz/jei/common/plugins/vanilla/crafting/CraftingRecipeCategory.java
@@ -3,7 +3,6 @@
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.constants.RecipeTypes;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.gui.ingredient.ICraftingGridHelper;
@@ -41,7 +40,7 @@ public class CraftingRecipeCategory implements IExtendableRecipeCategory<Craftin
 	public CraftingRecipeCategory(IGuiHelper guiHelper) {
 		ResourceLocation location = Constants.RECIPE_GUI_VANILLA;
 		background = guiHelper.createDrawable(location, 0, 60, width, height);
-		icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(Blocks.CRAFTING_TABLE));
+		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.CRAFTING_TABLE));
 		localizedName = Component.translatable("gui.jei.category.craftingTable");
 		craftingGridHelper = guiHelper.createCraftingGridHelper();
 	}

diff --git a/...rc/main/java/mezz/jei/common/plugins/vanilla/stonecutting/StoneCuttingRecipeCategory.java b/...rc/main/java/mezz/jei/common/plugins/vanilla/stonecutting/StoneCuttingRecipeCategory.java
@@ -1,7 +1,6 @@
 package mezz.jei.common.plugins.vanilla.stonecutting;
 
 import mezz.jei.api.constants.RecipeTypes;
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.recipe.IFocusGroup;
 import mezz.jei.api.recipe.RecipeIngredientRole;
@@ -28,7 +27,7 @@ public class StoneCuttingRecipeCategory implements IRecipeCategory<StonecutterRe
 	public StoneCuttingRecipeCategory(IGuiHelper guiHelper) {
 		ResourceLocation location = Constants.RECIPE_GUI_VANILLA;
 		background = guiHelper.createDrawable(location, 0, 220, width, height);
-		icon = guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(Blocks.STONECUTTER));
+		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.STONECUTTER));
 		localizedName = Component.translatable("gui.jei.category.stoneCutter");
 	}
 

diff --git a/Common/src/main/java/mezz/jei/common/transfer/RecipeTransferUtil.java b/Common/src/main/java/mezz/jei/common/transfer/RecipeTransferUtil.java
@@ -1,6 +1,5 @@
 package mezz.jei.common.transfer;
 
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.ingredient.IRecipeSlotView;
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
 import mezz.jei.api.helpers.IStackHelper;
@@ -214,7 +213,7 @@ public static RecipeTransferOperationsResult getRecipeTransferOperations(
 	@Nullable
 	public static <T> Map.Entry<T, ItemStack> containsAnyStackIndexed(IStackHelper stackhelper, Map<T, ItemStack> stacks, IRecipeSlotView recipeSlotView) {
 		MatchingIndexed<T> matchingStacks = new MatchingIndexed<>(stacks);
-		List<ItemStack> ingredients = recipeSlotView.getIngredients(VanillaTypes.ITEM_STACK).toList();
+		List<ItemStack> ingredients = recipeSlotView.getItemStacks().toList();
 		MatchingIterable matchingContains = new MatchingIterable(ingredients);
 		return containsStackMatchable(stackhelper, matchingStacks, matchingContains);
 	}

diff --git a/Common/src/main/java/mezz/jei/common/util/StackHelper.java b/Common/src/main/java/mezz/jei/common/util/StackHelper.java
@@ -1,6 +1,5 @@
 package mezz.jei.common.util;
 
-import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.helpers.IStackHelper;
 import mezz.jei.api.ingredients.subtypes.ISubtypeManager;
 import mezz.jei.api.ingredients.subtypes.UidContext;
@@ -42,7 +41,7 @@ public boolean isEquivalent(@Nullable ItemStack lhs, @Nullable ItemStack rhs, Ui
 	@Override
 	public String getUniqueIdentifierForStack(ItemStack stack, UidContext context) {
 		String result = getRegistryNameForStack(stack);
-		String subtypeInfo = subtypeManager.getSubtypeInfo(VanillaTypes.ITEM_STACK, stack, context);
+		String subtypeInfo = subtypeManager.getSubtypeInfo(stack, context);
 		if (!subtypeInfo.isEmpty()) {
 			result = result + ':' + subtypeInfo;
 		}

diff --git a/CommonApi/src/main/java/mezz/jei/api/gui/IRecipeLayoutDrawable.java b/CommonApi/src/main/java/mezz/jei/api/gui/IRecipeLayoutDrawable.java
@@ -2,10 +2,12 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
+import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.ingredients.IIngredientType;
 import mezz.jei.api.recipe.IFocus;
 import mezz.jei.api.recipe.IRecipeManager;
 import mezz.jei.api.recipe.category.IRecipeCategory;
+import net.minecraft.world.item.ItemStack;
 
 import java.util.Optional;
 
@@ -37,6 +39,16 @@ public interface IRecipeLayoutDrawable {
 	 */
 	boolean isMouseOver(double mouseX, double mouseY);
 
+	/**
+	 * Returns the ItemStack currently under the mouse, if there is one.
+	 *
+	 * @see #getIngredientUnderMouse(int, int, IIngredientType) to get other types of ingredient.
+	 * @since 11.1.1
+	 */
+	default Optional<ItemStack> getItemStackUnderMouse(int mouseX, int mouseY) {
+		return getIngredientUnderMouse(mouseX, mouseY, VanillaTypes.ITEM_STACK);
+	}
+
 	/**
 	 * Returns the ingredient currently under the mouse, if there is one.
 	 * Can be an ItemStack, FluidStack, or any other ingredient type registered with JEI.