From fd1f6dda322c967f05c72e312526c1d2fddd2086 Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Wed, 14 Jun 2023 20:42:58 +0100
Subject: [PATCH] Allow using printed books in chiseled bookshelves

---
 .../dan200/computercraft/data/TagProvider.java   |  2 ++
 .../minecraft/tags/items/bookshelf_books.json    |  1 +
 .../loot_modifiers/treasure_disk.json            | 16 ++++++++--------
 .../minecraft/tags/items/bookshelf_books.json    |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 projects/fabric/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json
 create mode 100644 projects/forge/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json

diff --git a/projects/common/src/main/java/dan200/computercraft/data/TagProvider.java b/projects/common/src/main/java/dan200/computercraft/data/TagProvider.java
index d72e1d9eb..5f0714feb 100644
--- a/projects/common/src/main/java/dan200/computercraft/data/TagProvider.java
+++ b/projects/common/src/main/java/dan200/computercraft/data/TagProvider.java
@@ -88,6 +88,8 @@ class TagProvider {
             ModRegistry.Items.MONITOR_ADVANCED.get()
         );
 
+        tags.tag(ItemTags.BOOKSHELF_BOOKS).add(ModRegistry.Items.PRINTED_BOOK.get());
+
         tags.tag(ComputerCraftTags.Items.TURTLE_CAN_PLACE)
             .add(Items.GLASS_BOTTLE)
             .addTag(ItemTags.BOATS);
diff --git a/projects/fabric/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json b/projects/fabric/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json
new file mode 100644
index 000000000..d34c32bfe
--- /dev/null
+++ b/projects/fabric/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json
@@ -0,0 +1 @@
+{"replace": false, "values": ["computercraft:printed_book"]}
diff --git a/projects/forge/src/generated/resources/data/computercraft/loot_modifiers/treasure_disk.json b/projects/forge/src/generated/resources/data/computercraft/loot_modifiers/treasure_disk.json
index 2a9d2b225..b1b21623b 100644
--- a/projects/forge/src/generated/resources/data/computercraft/loot_modifiers/treasure_disk.json
+++ b/projects/forge/src/generated/resources/data/computercraft/loot_modifiers/treasure_disk.json
@@ -5,15 +5,15 @@
       "condition": "minecraft:any_of",
       "terms": [
         {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/simple_dungeon"},
-        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/abandoned_mineshaft"},
-        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_corridor"},
-        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/woodland_mansion"},
-        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_library"},
-        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_crossing"},
-        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/desert_pyramid"},
-        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/jungle_temple"},
+        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/village/village_cartographer"},
         {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/igloo_chest"},
-        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/village/village_cartographer"}
+        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/jungle_temple"},
+        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/desert_pyramid"},
+        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_crossing"},
+        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_library"},
+        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/woodland_mansion"},
+        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_corridor"},
+        {"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/abandoned_mineshaft"}
       ]
     }
   ],
diff --git a/projects/forge/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json b/projects/forge/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json
new file mode 100644
index 000000000..ea1e2e76a
--- /dev/null
+++ b/projects/forge/src/generated/resources/data/minecraft/tags/items/bookshelf_books.json
@@ -0,0 +1 @@
+{"values": ["computercraft:printed_book"]}