Make better use of ItemLike and Item#getDefaultInstance

mezz · mezz · commit c8f25b915198 · 2024-09-13T12:13:31.000+09:00
diff --git a/CommonApi/src/main/java/mezz/jei/api/constants/VanillaTypes.java b/CommonApi/src/main/java/mezz/jei/api/constants/VanillaTypes.java
@@ -35,7 +35,7 @@ public Item getBase(ItemStack ingredient) {
 
 		@Override
 		public ItemStack getDefaultIngredient(Item base) {
-			return new ItemStack(base);
+			return base.getDefaultInstance();
 		}
 	};
 
diff --git a/CommonApi/src/main/java/mezz/jei/api/gui/builder/IIngredientAcceptor.java b/CommonApi/src/main/java/mezz/jei/api/gui/builder/IIngredientAcceptor.java
@@ -109,7 +109,7 @@ default THIS addItemStack(ItemStack itemStack) {
 	 * @since 19.18.1
 	 */
 	default IIngredientConsumer addItemLike(ItemLike itemLike) {
-		return addItemStack(new ItemStack(itemLike));
+		return addItemStack(itemLike.asItem().getDefaultInstance());
 	}
 
 	/**
diff --git a/CommonApi/src/main/java/mezz/jei/api/gui/builder/IIngredientConsumer.java b/CommonApi/src/main/java/mezz/jei/api/gui/builder/IIngredientConsumer.java
@@ -111,7 +111,7 @@ default IIngredientConsumer addItemStack(ItemStack itemStack) {
 	 * @since 19.18.1
 	 */
 	default IIngredientConsumer addItemLike(ItemLike itemLike) {
-		return addItemStack(new ItemStack(itemLike));
+		return addItemStack(itemLike.asItem().getDefaultInstance());
 	}
 
 	/**
diff --git a/CommonApi/src/main/java/mezz/jei/api/helpers/IGuiHelper.java b/CommonApi/src/main/java/mezz/jei/api/helpers/IGuiHelper.java
@@ -80,7 +80,7 @@ default IDrawable createDrawableItemStack(ItemStack ingredient) {
 	 * @since 19.18.1
 	 */
 	default IDrawable createDrawableItemLike(ItemLike itemLike) {
-		return createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(itemLike));
+		return createDrawableIngredient(VanillaTypes.ITEM_STACK, itemLike.asItem().getDefaultInstance());
 	}
 
 	/**
diff --git a/CommonApi/src/main/java/mezz/jei/api/registration/IRecipeCatalystRegistration.java b/CommonApi/src/main/java/mezz/jei/api/registration/IRecipeCatalystRegistration.java
@@ -35,7 +35,7 @@ public interface IRecipeCatalystRegistration {
 	 * @since 19.18.2
 	 */
 	default void addRecipeCatalyst(ItemLike itemLike, RecipeType<?>... recipeTypes) {
-		addRecipeCatalyst(VanillaTypes.ITEM_STACK, new ItemStack(itemLike), recipeTypes);
+		addRecipeCatalyst(VanillaTypes.ITEM_STACK, itemLike.asItem().getDefaultInstance(), recipeTypes);
 	}
 
 	/**
diff --git a/CommonApi/src/main/java/mezz/jei/api/registration/IRecipeRegistration.java b/CommonApi/src/main/java/mezz/jei/api/registration/IRecipeRegistration.java
@@ -84,7 +84,7 @@ public interface IRecipeRegistration {
 	 * @since 19.18.3
 	 */
 	default void addIngredientInfo(ItemLike itemLike, Component... descriptionComponents) {
-		addIngredientInfo(new ItemStack(itemLike), VanillaTypes.ITEM_STACK, descriptionComponents);
+		addIngredientInfo(itemLike.asItem().getDefaultInstance(), VanillaTypes.ITEM_STACK, descriptionComponents);
 	}
 
 	/**
diff --git a/Library/src/main/java/mezz/jei/library/gui/recipes/layout/builder/IngredientAcceptorVoid.java b/Library/src/main/java/mezz/jei/library/gui/recipes/layout/builder/IngredientAcceptorVoid.java
@@ -1,7 +1,6 @@
 package mezz.jei.library.gui.recipes.layout.builder;
 
 import mezz.jei.api.gui.builder.IIngredientAcceptor;
-import mezz.jei.api.gui.builder.IIngredientConsumer;
 import mezz.jei.api.ingredients.IIngredientType;
 import mezz.jei.api.ingredients.ITypedIngredient;
 import net.minecraft.core.component.DataComponentPatch;
diff --git a/Library/src/main/java/mezz/jei/library/gui/recipes/layout/builder/RecipeSlotBuilder.java b/Library/src/main/java/mezz/jei/library/gui/recipes/layout/builder/RecipeSlotBuilder.java
@@ -2,7 +2,6 @@
 
 import com.google.common.base.Preconditions;
 import it.unimi.dsi.fastutil.ints.IntSet;
-import mezz.jei.api.gui.builder.IIngredientConsumer;
 import mezz.jei.api.gui.builder.IRecipeSlotBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.gui.ingredient.IRecipeSlotDrawable;
diff --git a/Library/src/main/java/mezz/jei/library/gui/recipes/supplier/builder/IngredientSlotBuilder.java b/Library/src/main/java/mezz/jei/library/gui/recipes/supplier/builder/IngredientSlotBuilder.java
@@ -1,6 +1,5 @@
 package mezz.jei.library.gui.recipes.supplier.builder;
 
-import mezz.jei.api.gui.builder.IIngredientConsumer;
 import mezz.jei.api.gui.builder.IRecipeSlotBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.gui.ingredient.IRecipeSlotRichTooltipCallback;
diff --git a/Library/src/main/java/mezz/jei/library/ingredients/DisplayIngredientAcceptor.java b/Library/src/main/java/mezz/jei/library/ingredients/DisplayIngredientAcceptor.java
@@ -4,7 +4,6 @@
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import mezz.jei.api.gui.builder.IIngredientAcceptor;
-import mezz.jei.api.gui.builder.IIngredientConsumer;
 import mezz.jei.api.ingredients.IIngredientHelper;
 import mezz.jei.api.ingredients.IIngredientType;
 import mezz.jei.api.ingredients.IIngredientTypeWithSubtypes;
diff --git a/Library/src/main/java/mezz/jei/library/ingredients/SimpleIngredientAcceptor.java b/Library/src/main/java/mezz/jei/library/ingredients/SimpleIngredientAcceptor.java
@@ -2,7 +2,6 @@
 
 import com.google.common.base.Preconditions;
 import mezz.jei.api.gui.builder.IIngredientAcceptor;
-import mezz.jei.api.gui.builder.IIngredientConsumer;
 import mezz.jei.api.ingredients.IIngredientType;
 import mezz.jei.api.ingredients.IIngredientTypeWithSubtypes;
 import mezz.jei.api.ingredients.ITypedIngredient;
diff --git a/Library/src/main/java/mezz/jei/library/plugins/jei/JeiInternalPlugin.java b/Library/src/main/java/mezz/jei/library/plugins/jei/JeiInternalPlugin.java
@@ -24,7 +24,6 @@
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
 
 import java.util.ArrayList;
@@ -162,7 +161,7 @@ private static <B extends ItemLike> boolean createAndRegisterItemLikeTagCategory
 		tagInfoRecipeMakers.add(new TagInfoRecipeMaker<>(
 			VanillaTypes.ITEM_STACK,
 			recipeType,
-			ItemStack::new,
+			i -> i.asItem().getDefaultInstance(),
 			registryKey
 		));
 		return true;
diff --git a/Library/src/main/java/mezz/jei/library/plugins/jei/tags/TagInfoRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/jei/tags/TagInfoRecipeCategory.java
@@ -26,7 +26,6 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import org.apache.commons.lang3.StringUtils;
 
@@ -46,7 +45,7 @@ public class TagInfoRecipeCategory<R extends ITagInfoRecipe, T extends RecipeTyp
 
 	public TagInfoRecipeCategory(IGuiHelper guiHelper, T recipeType, ResourceLocation registryLocation) {
 		this.background = guiHelper.createBlankDrawable(WIDTH, HEIGHT);
-		this.icon = guiHelper.createDrawableItemStack(new ItemStack(Items.NAME_TAG));
+		this.icon = guiHelper.createDrawableItemLike(Items.NAME_TAG);
 		this.slotDrawable = guiHelper.getSlotDrawable();
 		this.recipeType = recipeType;
 		Component registryName = Component.translatableWithFallback(
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/anvil/AnvilRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/anvil/AnvilRecipeCategory.java
@@ -36,7 +36,7 @@ public AnvilRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.drawableBuilder(Constants.RECIPE_GUI_VANILLA, 0, 168, 125, 18)
 			.addPadding(0, 20, 0, 0)
 			.build();
-		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.ANVIL));
+		icon = guiHelper.createDrawableItemLike(Blocks.ANVIL);
 	}
 
 	@Override
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/anvil/SmithingRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/anvil/SmithingRecipeCategory.java
@@ -22,7 +22,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.SmithingRecipe;
 import net.minecraft.world.level.block.Blocks;
@@ -42,7 +41,7 @@ public class SmithingRecipeCategory implements IRecipeCategory<RecipeHolder<Smit
 	public SmithingRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.createBlankDrawable(108, 28);
 		slot = guiHelper.getSlotDrawable();
-		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.SMITHING_TABLE));
+		icon = guiHelper.createDrawableItemLike(Blocks.SMITHING_TABLE);
 		Textures textures = Internal.getTextures();
 		recipeArrow = textures.getRecipeArrow();
 	}
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/brewing/BrewingRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/brewing/BrewingRecipeCategory.java
@@ -38,7 +38,7 @@ public BrewingRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.drawableBuilder(location, 0, 0, 64, 60)
 			.addPadding(1, 0, 0, 50)
 			.build();
-		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.BREWING_STAND));
+		icon = guiHelper.createDrawableItemLike(Blocks.BREWING_STAND);
 		localizedName = Component.translatable("gui.jei.category.brewing");
 
 		arrow = guiHelper.drawableBuilder(location, 64, 0, 9, 28)
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/compostable/CompostableRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/compostable/CompostableRecipeCategory.java
@@ -16,7 +16,6 @@
 import net.minecraft.client.gui.Font;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Blocks;
 
 public class CompostableRecipeCategory implements IRecipeCategory<IJeiCompostingRecipe> {
@@ -31,7 +30,7 @@ public class CompostableRecipeCategory implements IRecipeCategory<IJeiComposting
 	public CompostableRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.createBlankDrawable(width, height);
 		slot = guiHelper.getSlotDrawable();
-		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.COMPOSTER));
+		icon = guiHelper.createDrawableItemLike(Blocks.COMPOSTER);
 		localizedName = Component.translatable("gui.jei.category.compostable");
 	}
 
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/cooking/AbstractCookingCategory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/cooking/AbstractCookingCategory.java
@@ -19,7 +19,6 @@
 import net.minecraft.client.gui.navigation.ScreenPosition;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.AbstractCookingRecipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.level.block.Block;
@@ -38,7 +37,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.createDrawableItemStack(new ItemStack(icon));
+		this.icon = guiHelper.createDrawableItemLike(icon);
 		this.localizedName = Component.translatable(translationKey);
 		this.guiHelper = guiHelper;
 	}
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/crafting/CraftingRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/crafting/CraftingRecipeCategory.java
@@ -25,7 +25,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.CraftingRecipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.level.block.Blocks;
@@ -45,7 +44,7 @@ public class CraftingRecipeCategory implements IExtendableCraftingRecipeCategory
 	public CraftingRecipeCategory(IGuiHelper guiHelper) {
 		ResourceLocation location = Constants.RECIPE_GUI_VANILLA;
 		background = guiHelper.createDrawable(location, 0, 60, width, height);
-		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.CRAFTING_TABLE));
+		icon = guiHelper.createDrawableItemLike(Blocks.CRAFTING_TABLE);
 		localizedName = Component.translatable("gui.jei.category.craftingTable");
 		craftingGridHelper = guiHelper.createCraftingGridHelper();
 	}
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/crafting/replacers/ShulkerBoxColoringRecipeMaker.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/crafting/replacers/ShulkerBoxColoringRecipeMaker.java
@@ -23,8 +23,7 @@ public final class ShulkerBoxColoringRecipeMaker {
 	private static final String group = "jei.shulker.color";
 
 	public static List<RecipeHolder<CraftingRecipe>> createRecipes() {
-		ItemStack baseShulkerStack = new ItemStack(Blocks.SHULKER_BOX);
-		Ingredient baseShulkerIngredient = Ingredient.of(baseShulkerStack);
+		Ingredient baseShulkerIngredient = Ingredient.of(Blocks.SHULKER_BOX);
 		return Arrays.stream(DyeColor.values())
 			.map(color -> createRecipe(color, baseShulkerIngredient))
 			.toList();
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/crafting/replacers/TippedArrowRecipeMaker.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/crafting/replacers/TippedArrowRecipeMaker.java
@@ -2,10 +2,7 @@
 
 import mezz.jei.api.constants.ModIds;
 import mezz.jei.api.helpers.IJeiHelpers;
-import mezz.jei.api.helpers.IStackHelper;
 import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory;
-import mezz.jei.common.platform.IPlatformIngredientHelper;
-import mezz.jei.common.platform.Services;
 import mezz.jei.common.util.RegistryUtil;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
@@ -24,15 +21,13 @@
 public final class TippedArrowRecipeMaker {
 
 	public static List<RecipeHolder<CraftingRecipe>> createRecipes(IJeiHelpers jeiHelpers) {
-		IStackHelper stackHelper = jeiHelpers.getStackHelper();
 		IVanillaRecipeFactory vanillaRecipeFactory = jeiHelpers.getVanillaRecipeFactory();
 
 		String group = "jei.tipped.arrow";
 		ItemStack arrowStack = new ItemStack(Items.ARROW);
 		Ingredient arrowIngredient = Ingredient.of(arrowStack);
 
 		Registry<Potion> potionRegistry = RegistryUtil.getRegistry(Registries.POTION);
-		IPlatformIngredientHelper ingredientHelper = Services.PLATFORM.getIngredientHelper();
 		return potionRegistry.holders()
 			.map(potion -> {
 				ItemStack input = PotionContents.createItemStack(Items.LINGERING_POTION, potion);
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/ingredients/fluid/FluidIngredientHelper.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/ingredients/fluid/FluidIngredientHelper.java
@@ -137,7 +137,7 @@ private ResourceLocation getRegistryName(T ingredient, Fluid fluid) {
 	public ItemStack getCheatItemStack(T ingredient) {
 		Fluid fluid = fluidType.getBase(ingredient);
 		Item filledBucket = fluid.getBucket();
-		return new ItemStack(filledBucket);
+		return filledBucket.getDefaultInstance();
 	}
 
 	@Override
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/stonecutting/StoneCuttingRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/stonecutting/StoneCuttingRecipeCategory.java
@@ -12,7 +12,6 @@
 import mezz.jei.library.util.RecipeUtil;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.StonecutterRecipe;
 import net.minecraft.resources.ResourceLocation;
 
@@ -32,7 +31,7 @@ public class StoneCuttingRecipeCategory implements IRecipeCategory<RecipeHolder<
 	public StoneCuttingRecipeCategory(IGuiHelper guiHelper) {
 		ResourceLocation location = Constants.RECIPE_GUI_VANILLA;
 		background = guiHelper.createDrawable(location, 0, 220, width, height);
-		icon = guiHelper.createDrawableItemStack(new ItemStack(Blocks.STONECUTTER));
+		icon = guiHelper.createDrawableItemLike(Blocks.STONECUTTER);
 		localizedName = Component.translatable("gui.jei.category.stoneCutter");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public Item getBase(ItemStack ingredient) {`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public ItemStack getDefaultIngredient(Item base) {`
`38`		`- return new ItemStack(base);`
	`38`	`+ return base.getDefaultInstance();`
`39`	`39`	`}`
`40`	`40`	`};`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ default THIS addItemStack(ItemStack itemStack) {`
`109`	`109`	`* @since 19.18.1`
`110`	`110`	`*/`
`111`	`111`	`default IIngredientConsumer addItemLike(ItemLike itemLike) {`
`112`		`- return addItemStack(new ItemStack(itemLike));`
	`112`	`+ return addItemStack(itemLike.asItem().getDefaultInstance());`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ default IIngredientConsumer addItemStack(ItemStack itemStack) {`
`111`	`111`	`* @since 19.18.1`
`112`	`112`	`*/`
`113`	`113`	`default IIngredientConsumer addItemLike(ItemLike itemLike) {`
`114`		`- return addItemStack(new ItemStack(itemLike));`
	`114`	`+ return addItemStack(itemLike.asItem().getDefaultInstance());`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ default IDrawable createDrawableItemStack(ItemStack ingredient) {`
`80`	`80`	`* @since 19.18.1`
`81`	`81`	`*/`
`82`	`82`	`default IDrawable createDrawableItemLike(ItemLike itemLike) {`
`83`		`- return createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(itemLike));`
	`83`	`+ return createDrawableIngredient(VanillaTypes.ITEM_STACK, itemLike.asItem().getDefaultInstance());`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public interface IRecipeCatalystRegistration {`
`35`	`35`	`* @since 19.18.2`
`36`	`36`	`*/`
`37`	`37`	`default void addRecipeCatalyst(ItemLike itemLike, RecipeType<?>... recipeTypes) {`
`38`		`- addRecipeCatalyst(VanillaTypes.ITEM_STACK, new ItemStack(itemLike), recipeTypes);`
	`38`	`+ addRecipeCatalyst(VanillaTypes.ITEM_STACK, itemLike.asItem().getDefaultInstance(), recipeTypes);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public interface IRecipeRegistration {`
`84`	`84`	`* @since 19.18.3`
`85`	`85`	`*/`
`86`	`86`	`default void addIngredientInfo(ItemLike itemLike, Component... descriptionComponents) {`
`87`		`- addIngredientInfo(new ItemStack(itemLike), VanillaTypes.ITEM_STACK, descriptionComponents);`
	`87`	`+ addIngredientInfo(itemLike.asItem().getDefaultInstance(), VanillaTypes.ITEM_STACK, descriptionComponents);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/**`