From 74dde2ef0e3c3fab6f22e24bbde36ad6ae13d12e Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Mon, 30 Sep 2019 11:55:05 +1000 Subject: [PATCH] Reload tags when their generation increases --- .../book/data/element/ItemStackData.java | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) 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 e2edd18..4a36d0b 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 @@ -33,13 +33,19 @@ public class ItemStackData implements IDataElement { public JsonObject nbt; private transient boolean customData; + private transient boolean isTag; + private transient int tagGeneration; public NonNullList getItems() { + if(isTag && tagGeneration != ItemTags.getGeneration()) { + loadTag(); + } + if (items != null) { return items; } - return NonNullList.withSize(1, getItem()); + return NonNullList.withSize(1, getItem()); } private ItemStack getItem() { @@ -109,21 +115,29 @@ public class ItemStackData implements IDataElement { return s.replaceAll("\"(\\w+)\"\\s*:", "$1: "); } + private void loadTag() { + isTag = true; + tagGeneration = ItemTags.getGeneration(); + + Tag values = ItemTags.getCollection().get(new ResourceLocation(tag)); + if (values != null) { + items = values.getAllElements().stream().map(ItemStack::new).collect(Collectors.toCollection(NonNullList::create)); + } + else { + items = NonNullList.create(); + } + } + @Override public void load(BookRepository source) { - if(customData) { + if (customData) { 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; - } + if (!StringUtils.isNullOrEmpty(tag) && ResourceLocation.isResouceNameValid(tag)) { + loadTag(); + id = "->itemList"; + return; } ResourceLocation location = source.getResourceLocation(itemList); @@ -142,7 +156,8 @@ public class ItemStackData implements IDataElement { } this.action = itemsList.action; - } catch (Exception ignored) { + } + catch (Exception ignored) { } } }