Rename to match yarn.

modmuss50 · Oct 10, 2024 · 22667d4 · 22667d4
1 parent 5eabe0b
commit 22667d4
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/...e-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java b/...e-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java
@@ -73,7 +73,7 @@ public interface CustomIngredient {
 	 *
 	 * <p>Note: no caching needs to be done by the implementation, this is already handled by the ingredient itself.
 	 */
-	List<RegistryEntry<Item>> getMatchingStacks();
+	List<RegistryEntry<Item>> getMatchingItems();
 
 	/**
 	 * Returns whether this ingredient always requires {@linkplain #test direct stack testing}.
@@ -97,10 +97,10 @@ public interface CustomIngredient {
 	 */
 	default SlotDisplay toDisplay() {
 		// Matches the vanilla logic in Ingredient.toDisplay()
-		return RegistryEntryList.of(getMatchingStacks()).getStorage().map(
+		return RegistryEntryList.of(getMatchingItems()).getStorage().map(
 				SlotDisplay.TagSlotDisplay::new,
 				(itemEntries) -> new SlotDisplay.CompositeSlotDisplay(
-						itemEntries.stream().map(Ingredient::method_64981).toList()
+						itemEntries.stream().map(Ingredient::createDisplayWithRemainder).toList()
 				));
 	}
 

diff --git a/...api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java b/...api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java
@@ -95,7 +95,7 @@ public boolean requiresTesting() {
 	@Override
 	public List<RegistryEntry<Item>> getMatchingStacks() {
 		if (this.matchingStacks == null) {
-			this.matchingStacks = customIngredient.getMatchingStacks();
+			this.matchingStacks = customIngredient.getMatchingItems();
 		}
 
 		return this.matchingStacks;

diff --git a/...pi-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AllIngredient.java b/...pi-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AllIngredient.java
@@ -54,7 +54,7 @@ public boolean test(ItemStack stack) {
 	}
 
 	@Override
-	public List<RegistryEntry<Item>> getMatchingStacks() {
+	public List<RegistryEntry<Item>> getMatchingItems() {
 		// There's always at least one sub ingredient, so accessing ingredients[0] is safe.
 		List<RegistryEntry<Item>> previewStacks = new ArrayList<>(ingredients.getFirst().getMatchingStacks());
 

diff --git a/...pi-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AnyIngredient.java b/...pi-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AnyIngredient.java
@@ -54,7 +54,7 @@ public boolean test(ItemStack stack) {
 	}
 
 	@Override
-	public List<RegistryEntry<Item>> getMatchingStacks() {
+	public List<RegistryEntry<Item>> getMatchingItems() {
 		List<RegistryEntry<Item>> previewStacks = new ArrayList<>();
 
 		for (Ingredient ingredient : ingredients) {

diff --git a/...rc/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/ComponentsIngredient.java b/...rc/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/ComponentsIngredient.java
@@ -84,7 +84,7 @@ public boolean test(ItemStack stack) {
 	}
 
 	@Override
-	public List<RegistryEntry<Item>> getMatchingStacks() {
+	public List<RegistryEntry<Item>> getMatchingItems() {
 		return base.getMatchingStacks();
 	}
 

diff --git a/...rc/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CustomDataIngredient.java b/...rc/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CustomDataIngredient.java
@@ -60,7 +60,7 @@ public boolean test(ItemStack stack) {
 	}
 
 	@Override
-	public List<RegistryEntry<Item>> getMatchingStacks() {
+	public List<RegistryEntry<Item>> getMatchingItems() {
 		return base.getMatchingStacks();
 	}
 

diff --git a/...rc/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java b/...rc/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java
@@ -49,7 +49,7 @@ public boolean test(ItemStack stack) {
 	}
 
 	@Override
-	public List<RegistryEntry<Item>> getMatchingStacks() {
+	public List<RegistryEntry<Item>> getMatchingItems() {
 		final List<RegistryEntry<Item>> subtractedMatchingStacks = subtracted.getMatchingStacks();
 		return base.getMatchingStacks().stream()
 				.filter(registryEntry -> !subtractedMatchingStacks.contains(registryEntry))

diff --git a/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.accesswidener b/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.accesswidener
@@ -3,7 +3,7 @@ accessWidener   v2  named
 extendable    class    net/minecraft/recipe/Ingredient
 accessible    method   net/minecraft/recipe/Ingredient <init> (Lnet/minecraft/registry/entry/RegistryEntryList;)V
 accessible    field    net/minecraft/recipe/Ingredient matchingStacks Ljava/util/List;
-accessible    method   net/minecraft/recipe/Ingredient method_64981 (Lnet/minecraft/registry/entry/RegistryEntry;)Lnet/minecraft/recipe/display/SlotDisplay;
+accessible    method   net/minecraft/recipe/Ingredient createDisplayWithRemainder (Lnet/minecraft/registry/entry/RegistryEntry;)Lnet/minecraft/recipe/display/SlotDisplay;
 
 accessible    field    net/minecraft/network/ClientConnection    channel    Lio/netty/channel/Channel;