From 50a7834d8816b8df7167cd691e8f5c362881a23a Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Sat, 8 Jun 2024 18:07:56 +0200 Subject: [PATCH] feat: improve tag QoL Closes #1114 --- .../minecraft/tags/items/bookshelf_books.json | 17 +++++++++++++++++ .../datagen/tags/OccultismItemTagProvider.java | 17 +++++++++++++++++ .../occultism/registry/OccultismTags.java | 3 --- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/items/bookshelf_books.json diff --git a/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json b/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json new file mode 100644 index 000000000..a387bcb96 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json @@ -0,0 +1,17 @@ +{ + "values": [ + "occultism:dictionary_of_spirits", + "occultism:book_of_binding_foliot", + "occultism:book_of_binding_djinni", + "occultism:book_of_binding_afrit", + "occultism:book_of_binding_marid", + "occultism:book_of_binding_bound_foliot", + "occultism:book_of_binding_bound_djinni", + "occultism:book_of_binding_bound_afrit", + "occultism:book_of_binding_bound_marid", + "occultism:book_of_calling_djinni_manage_machine", + "occultism:book_of_calling_foliot_cleaner", + "occultism:book_of_calling_foliot_lumberjack", + "occultism:book_of_calling_foliot_transport_items" + ] +} \ No newline at end of file diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java index 0a824a571..0f97ba9b4 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismItemTagProvider.java @@ -72,6 +72,23 @@ private void addMinecraftTags(HolderLookup.Provider provider) { this.copy(BlockTags.SAPLINGS,ItemTags.SAPLINGS); this.tag(ItemTags.PICKAXES).add(OccultismItems.INFUSED_PICKAXE.get(),OccultismItems.IESNIUM_PICKAXE.get()).replace(false); this.tag(ItemTags.SWORDS).add(OccultismItems.BUTCHER_KNIFE.get()).replace(false); + + this.tag(ItemTags.BOOKSHELF_BOOKS) + .replace(false) + .add(OccultismItems.DICTIONARY_OF_SPIRITS.get()) + .add(OccultismItems.BOOK_OF_BINDING_FOLIOT.get()) + .add(OccultismItems.BOOK_OF_BINDING_DJINNI.get()) + .add(OccultismItems.BOOK_OF_BINDING_AFRIT.get()) + .add(OccultismItems.BOOK_OF_BINDING_MARID.get()) + .add(OccultismItems.BOOK_OF_BINDING_BOUND_FOLIOT.get()) + .add(OccultismItems.BOOK_OF_BINDING_BOUND_DJINNI.get()) + .add(OccultismItems.BOOK_OF_BINDING_BOUND_AFRIT.get()) + .add(OccultismItems.BOOK_OF_BINDING_BOUND_MARID.get()) + .add(OccultismItems.BOOK_OF_CALLING_DJINNI_MANAGE_MACHINE.get()) + .add(OccultismItems.BOOK_OF_CALLING_FOLIOT_CLEANER.get()) + .add(OccultismItems.BOOK_OF_CALLING_FOLIOT_LUMBERJACK.get()) + .add(OccultismItems.BOOK_OF_CALLING_FOLIOT_TRANSPORT_ITEMS.get()); + } private void addForgeTags(HolderLookup.Provider provider) { diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java index b0377f4f0..d2fca8213 100644 --- a/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java @@ -56,9 +56,6 @@ public static class Blocks { public static class Items { - - - public static final TagKey IESNIUM_ORE = makeItemTag(new ResourceLocation("forge", "ores/iesnium")); public static final TagKey SILVER_ORE = makeItemTag(new ResourceLocation("forge", "ores/silver")); public static final TagKey RAW_IESNIUM = makeItemTag(new ResourceLocation("forge", "raw_materials/iesnium"));