Add relevant books to forge:books and use that as default bookshelf list

KnightMiner · May 13, 2021 · 5c07acb · 5c07acb
1 parent 874d40c
commit 5c07acb
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 31 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-mod_version=1.2.2
+mod_version=1.2.2.DEV
 
 # Minecraft Version Information
 minecraft_version=1.16.5

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -1,3 +1,4 @@
+505007799cf85694a9dc84bdfdd94ce5a51489cc data/forge/tags/items/books.json
 eaf9ea781f5220889d762b91e1267309994f1634 data/forge/tags/items/bookshelves.json
 310fd9b17f2286a204c0552bd9b8c1c5769c5a70 data/forge/tags/items/dyes/black.json
 d62d9549d00dfb79731abd7d3622a4a8efbac828 data/forge/tags/items/dyes/blue.json
@@ -893,7 +894,7 @@ a87ebc00fb1955def1e140e4d760ebb867368ced data/inspirations/tags/blocks/cauldron_
 150684de449bf92f1ee6c2b1edfcfbc9b73e31fe data/inspirations/tags/blocks/mulch.json
 a0b3fd5ce7eaf9e816a1a2752a10f2179cc22170 data/inspirations/tags/blocks/shelves.json
 ed609d879b511fc63075a70306670eca432041c0 data/inspirations/tags/blocks/small_flowers.json
-f9cca99a22b0100163020f98af91d1810bd69ca6 data/inspirations/tags/items/books.json
+f8b9c7e4d99fb2a04fca0cfc55b05396c3bb95ea data/inspirations/tags/items/books.json
 a0b3fd5ce7eaf9e816a1a2752a10f2179cc22170 data/inspirations/tags/items/bookshelves.json
 85c18a3259a3290405d1f9b53f263fa73d5016f3 data/inspirations/tags/items/carpeted_trapdoors.json
 13952d80b58aeec6e0eedccd3ddf31a863df7945 data/inspirations/tags/items/carpets.json

diff --git a/src/generated/resources/data/forge/tags/items/books.json b/src/generated/resources/data/forge/tags/items/books.json
@@ -0,0 +1,27 @@
+{
+  "replace": false,
+  "values": [
+    "inspirations:redstone_book",
+    "minecraft:book",
+    "minecraft:writable_book",
+    "minecraft:written_book",
+    "minecraft:enchanted_book",
+    "minecraft:knowledge_book",
+    "inspirations:white_book",
+    "inspirations:orange_book",
+    "inspirations:magenta_book",
+    "inspirations:light_blue_book",
+    "inspirations:yellow_book",
+    "inspirations:lime_book",
+    "inspirations:pink_book",
+    "inspirations:gray_book",
+    "inspirations:light_gray_book",
+    "inspirations:cyan_book",
+    "inspirations:purple_book",
+    "inspirations:blue_book",
+    "inspirations:brown_book",
+    "inspirations:green_book",
+    "inspirations:red_book",
+    "inspirations:black_book"
+  ]
+}
diff --git a/src/generated/resources/data/inspirations/tags/items/books.json b/src/generated/resources/data/inspirations/tags/items/books.json
@@ -1,31 +1,6 @@
 {
   "replace": false,
   "values": [
-    {
-      "id": "#forge:books",
-      "required": false
-    },
-    "inspirations:redstone_book",
-    "minecraft:book",
-    "minecraft:writable_book",
-    "minecraft:written_book",
-    "minecraft:enchanted_book",
-    "minecraft:knowledge_book",
-    "inspirations:white_book",
-    "inspirations:orange_book",
-    "inspirations:magenta_book",
-    "inspirations:light_blue_book",
-    "inspirations:yellow_book",
-    "inspirations:lime_book",
-    "inspirations:pink_book",
-    "inspirations:gray_book",
-    "inspirations:light_gray_book",
-    "inspirations:cyan_book",
-    "inspirations:purple_book",
-    "inspirations:blue_book",
-    "inspirations:brown_book",
-    "inspirations:green_book",
-    "inspirations:red_book",
-    "inspirations:black_book"
+    "#forge:books"
   ]
 }
diff --git a/src/main/java/knightminer/inspirations/common/datagen/InspirationsItemTagsProvider.java b/src/main/java/knightminer/inspirations/common/datagen/InspirationsItemTagsProvider.java
@@ -15,7 +15,6 @@
 import net.minecraft.item.Items;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.data.ExistingFileHelper;
 
@@ -46,12 +45,12 @@ private void registerInspTags() {
     this.getOrCreateBuilder(ItemTags.DOORS).add(InspirationsBuilding.glassDoorItem);
     this.copy(BlockTags.TRAPDOORS, ItemTags.TRAPDOORS);
 
-    Builder<Item> bookBuilder = this.getOrCreateBuilder(InspirationsTags.Items.BOOKS)
-        .addOptionalTag(new ResourceLocation("forge", "books")) // TODO: once this is more standarized, move later books to this
+    Builder<Item> bookBuilder = this.getOrCreateBuilder(InspirationsTags.Items.FORGE_BOOKS)
         .add(InspirationsBuilding.redstoneBook)
         .add(Items.BOOK, Items.WRITABLE_BOOK, Items.WRITTEN_BOOK)
         .add(Items.ENCHANTED_BOOK, Items.KNOWLEDGE_BOOK);
     InspirationsBuilding.coloredBooks.values().forEach(bookBuilder::add);
+    this.getOrCreateBuilder(InspirationsTags.Items.BOOKS).addTag(InspirationsTags.Items.FORGE_BOOKS);
 
     // item list of all relevant carpets
     Builder<Item> carpetBuilder = this.getOrCreateBuilder(InspirationsTags.Items.CARPETS);

diff --git a/src/main/java/knightminer/inspirations/library/InspirationsTags.java b/src/main/java/knightminer/inspirations/library/InspirationsTags.java
@@ -53,6 +53,11 @@ public static class Items {
 
     public static final IOptionalNamedTag<Item> MILK_CONTAINERS = tag("milk_containers");
 
+    /**
+     * Forge tags for anything that is a book
+     */
+    public static final IOptionalNamedTag<Item> FORGE_BOOKS = forgeTag("books");
+
     /**
      * Items which are valid to be placed on bookshelves.
      */