From 73d1dc902635c2ff8e8a5d70eb3f428277d99f74 Mon Sep 17 00:00:00 2001
From: lukasabbe <67807954+lukasabbe@users.noreply.github.com>
Date: Fri, 11 Apr 2025 12:50:08 +0200
Subject: [PATCH] Support for " More Chiseled Bookshelf Variants\

---
 gradle.properties                                      |  2 +-
 .../me/lukasabbe/bookshelfinspector/data/Tags.java     | 10 ++++++++++
 .../lukasabbe/bookshelfinspector/util/Inspector.java   |  5 ++---
 .../data/c/tags/block/chiseled_bookshelves.json        |  6 ++++++
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/me/lukasabbe/bookshelfinspector/data/Tags.java
 create mode 100644 src/main/resources/data/c/tags/block/chiseled_bookshelves.json

diff --git a/gradle.properties b/gradle.properties
index e07b518..cff88c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.21.5
 yarn_mappings=1.21.5+build.1
 loader_version=0.16.10
 # Mod Properties
-mod_version=1.10+1.21.5
+mod_version=1.11+1.21.5
 maven_group=me.lukasabbe
 archives_base_name=Bookshelfinspector
 
diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/data/Tags.java b/src/main/java/me/lukasabbe/bookshelfinspector/data/Tags.java
new file mode 100644
index 0000000..f052341
--- /dev/null
+++ b/src/main/java/me/lukasabbe/bookshelfinspector/data/Tags.java
@@ -0,0 +1,10 @@
+package me.lukasabbe.bookshelfinspector.data;
+
+import net.minecraft.block.Block;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+public class Tags {
+    public static final TagKey<Block> CHISELED_BOOKSHELVES = TagKey.of(RegistryKeys.BLOCK, Identifier.of("c", "chiseled_bookshelves"));
+}
diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java b/src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java
index 676d0bb..9ac85c4 100644
--- a/src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java
+++ b/src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java
@@ -2,18 +2,17 @@ package me.lukasabbe.bookshelfinspector.util;
 
 import me.lukasabbe.bookshelfinspector.BookshelfinspectorClient;
 import me.lukasabbe.bookshelfinspector.data.BookData;
+import me.lukasabbe.bookshelfinspector.data.Tags;
 import me.lukasabbe.bookshelfinspector.mixin.BookshelfInvoker;
 import me.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload;
 import me.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.ChiseledBookshelfBlock;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
@@ -53,7 +52,7 @@ public class Inspector {
         bookShelfData.latestPos = pos;
 
 
-        if(client.player.getWorld().getBlockState(pos).isOf(Blocks.CHISELED_BOOKSHELF)){
+        if(client.player.getWorld().getBlockState(pos).isIn(Tags.CHISELED_BOOKSHELVES)){
             bookShelfInspect(pos, blockHitResult, client);
         }else if(client.player.getWorld().getBlockState(pos).isOf(Blocks.LECTERN) && config.lecternToggle){
             lecternInspect(pos);
diff --git a/src/main/resources/data/c/tags/block/chiseled_bookshelves.json b/src/main/resources/data/c/tags/block/chiseled_bookshelves.json
new file mode 100644
index 0000000..fe20353
--- /dev/null
+++ b/src/main/resources/data/c/tags/block/chiseled_bookshelves.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:chiseled_bookshelf"
+  ]
+}
\ No newline at end of file