From 910cf5945ffd6162e6ab96007244a1851e3f5dbe Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Mon, 30 Sep 2019 10:09:30 +1000 Subject: [PATCH] Added tag support for ItemStackData --- .../client/book/data/element/ItemStackData.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java b/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java index 64eadbc..e2edd18 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java @@ -10,15 +10,21 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.nbt.StringNBT; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StringUtils; import net.minecraftforge.registries.ForgeRegistries; import slimeknights.mantle.client.book.BookLoader; import slimeknights.mantle.client.book.repository.BookRepository; +import java.util.stream.Collectors; + public class ItemStackData implements IDataElement { public String itemList = null; + public String tag = null; public transient String action; private transient NonNullList items; @@ -109,6 +115,17 @@ public class ItemStackData implements IDataElement { return; } + if(!StringUtils.isNullOrEmpty(tag) && ResourceLocation.isResouceNameValid(tag)) { + Tag values = ItemTags.getCollection().get(new ResourceLocation(tag)); + + if (values != null && !values.getAllElements().isEmpty()) { + items = values.getAllElements().stream().map(ItemStack::new).collect(Collectors.toCollection(NonNullList::create)); + + id = "->itemList"; + return; + } + } + ResourceLocation location = source.getResourceLocation(itemList); if (location != null) {