FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-02-25 07:54:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename CustomIngredient.getMatchingStacks & add CustomIngredient.toDisplay (#4152)

Browse source 
* Add CustomIngredient.toDisplay

* Imports

* Rename to match yarn.
This commit is contained in:
modmuss 2024-10-11 15:15:12 +01:00 committed by GitHub
parent 90e7264282
commit 6eee591dd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 61 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java
View file

@ -23,7 +23,9 @@ import org.jetbrains.annotations.ApiStatus;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.display.SlotDisplay;
import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.registry.entry.RegistryEntryList;
import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientImpl; import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientImpl;
@ -88,6 +90,20 @@ public interface CustomIngredient {
*/ */
CustomIngredientSerializer<?> getSerializer(); CustomIngredientSerializer<?> getSerializer();
/**
* Returns a {@link SlotDisplay} representing this ingredient, this is synced to the client to display in the recipe book.
*
* @return a {@link SlotDisplay} instance.
*/
default SlotDisplay toDisplay() {
// Matches the vanilla logic in Ingredient.toDisplay()
return RegistryEntryList.of(getMatchingItems()).getStorage().map(
SlotDisplay.TagSlotDisplay::new,
(itemEntries) -> new SlotDisplay.CompositeSlotDisplay(
itemEntries.stream().map(Ingredient::createDisplayWithRemainder).toList()
));
}
/** /**
* {@return a new {@link Ingredient} behaving as defined by this custom ingredient}. * {@return a new {@link Ingredient} behaving as defined by this custom ingredient}.
*/ */

6
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java
View file

@ -30,6 +30,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items; import net.minecraft.item.Items;
import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.display.SlotDisplay;
import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.registry.entry.RegistryEntryList; import net.minecraft.registry.entry.RegistryEntryList;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -104,4 +105,9 @@ public class CustomIngredientImpl extends Ingredient {
public boolean test(@Nullable ItemStack stack) { public boolean test(@Nullable ItemStack stack) {
return stack != null && customIngredient.test(stack); return stack != null && customIngredient.test(stack);
} }
@Override
public SlotDisplay toDisplay() {
return customIngredient.toDisplay();
}
} }

8
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CombinedIngredient.java
View file

@ -25,6 +25,7 @@ import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec; import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.codec.PacketCodecs; import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.display.SlotDisplay;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient; import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient;
@ -59,6 +60,13 @@ abstract class CombinedIngredient implements CustomIngredient {
return ingredients; return ingredients;
} }
@Override
public SlotDisplay toDisplay() {
return new SlotDisplay.CompositeSlotDisplay(
ingredients.stream().map(Ingredient::toDisplay).toList()
);
}
static class Serializer<I extends CombinedIngredient> implements CustomIngredientSerializer<I> { static class Serializer<I extends CombinedIngredient> implements CustomIngredientSerializer<I> {
private final Identifier identifier; private final Identifier identifier;
private final MapCodec<I> codec; private final MapCodec<I> codec;

22
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/ComponentsIngredient.java
View file

@ -32,6 +32,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec; import net.minecraft.network.codec.PacketCodec;
import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.display.SlotDisplay;
import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -84,13 +85,20 @@ public class ComponentsIngredient implements CustomIngredient {
@Override @Override
public List<RegistryEntry<Item>> getMatchingItems() { public List<RegistryEntry<Item>> getMatchingItems() {
return base.getMatchingItems().stream() return base.getMatchingItems();
.filter(registryEntry -> { }
ItemStack itemStack = registryEntry.value().getDefaultStack();
itemStack.applyChanges(components); @Override
return base.test(itemStack); public SlotDisplay toDisplay() {
}) return new SlotDisplay.CompositeSlotDisplay(
.toList(); base.getMatchingItems().stream().map(this::createEntryDisplay).toList()
);
}
private SlotDisplay createEntryDisplay(RegistryEntry<Item> entry) {
ItemStack stack = entry.value().getDefaultStack();
stack.applyChanges(components);
return new SlotDisplay.StackSlotDisplay(stack);
} }
@Override @Override

22
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CustomDataIngredient.java
View file

@ -31,6 +31,7 @@ import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec; import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.codec.PacketCodecs; import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.display.SlotDisplay;
import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -60,13 +61,20 @@ public class CustomDataIngredient implements CustomIngredient {
@Override @Override
public List<RegistryEntry<Item>> getMatchingItems() { public List<RegistryEntry<Item>> getMatchingItems() {
return base.getMatchingItems().stream() return base.getMatchingItems();
.filter(registryEntry -> { }
ItemStack itemStack = registryEntry.value().getDefaultStack();
itemStack.apply(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT, existingNbt -> NbtComponent.of(existingNbt.copyNbt().copyFrom(nbt))); @Override
return base.test(itemStack); public SlotDisplay toDisplay() {
}) return new SlotDisplay.CompositeSlotDisplay(
.toList(); base.getMatchingItems().stream().map(this::createEntryDisplay).toList()
);
}
private SlotDisplay createEntryDisplay(RegistryEntry<Item> entry) {
ItemStack stack = entry.value().getDefaultStack();
stack.apply(DataComponentTypes.CUSTOM_DATA, NbtComponent.DEFAULT, existingNbt -> NbtComponent.of(existingNbt.copyNbt().copyFrom(nbt)));
return new SlotDisplay.StackSlotDisplay(stack);
} }
@Override @Override

1
fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.accesswidener
View file

@ -3,6 +3,7 @@ accessWidener v2 named
extendable class net/minecraft/recipe/Ingredient extendable class net/minecraft/recipe/Ingredient
accessible method net/minecraft/recipe/Ingredient <init> (Lnet/minecraft/registry/entry/RegistryEntryList;)V accessible method net/minecraft/recipe/Ingredient <init> (Lnet/minecraft/registry/entry/RegistryEntryList;)V
accessible field net/minecraft/recipe/Ingredient matchingItems Ljava/util/List; accessible field net/minecraft/recipe/Ingredient matchingItems Ljava/util/List;
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; accessible field net/minecraft/network/ClientConnection channel Lio/netty/channel/Channel;