From bd8aed1e2716fc57fefc640d303e403ba761e3b1 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 12 Feb 2022 03:12:09 +0800 Subject: Update to 22w06a --- api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java | 4 +++- .../me/shedaniel/rei/api/common/entry/type/EntryDefinition.java | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'api/src/main/java/me') diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java index 8b0f2e0eb..b602b7293 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java @@ -41,6 +41,7 @@ import net.fabricmc.api.Environment; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; import net.minecraft.util.Unit; import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.ApiStatus; @@ -49,6 +50,7 @@ import org.jetbrains.annotations.Nullable; import java.util.*; import java.util.function.BiFunction; import java.util.function.Function; +import java.util.stream.Stream; /** * @see me.shedaniel.rei.api.common.util.EntryStacks @@ -173,7 +175,7 @@ public interface EntryStack extends TextRepresentable, Renderer { */ EntryStack wildcard(); - Collection getTagsFor(); + Stream> getTagsFor(); @Deprecated int hashCode(); diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java index 3d75e84ce..97ac1ae92 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java @@ -33,12 +33,12 @@ import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.TagContainer; +import net.minecraft.tags.TagKey; import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; -import java.util.Collection; +import java.util.stream.Stream; /** * A definition of an {@link EntryType}, an interface to provide information from an object type. @@ -163,7 +163,7 @@ public interface EntryDefinition { Component asFormattedText(EntryStack entry, T value); - Collection getTagsFor(TagContainer tagContainer, EntryStack entry, T value); + Stream> getTagsFor(EntryStack entry, T value); @ApiStatus.NonExtendable default EntryDefinition cast() { -- cgit