fix: old patchouli books not working when right clicking tables

williambl · Oct 11, 2022 · cd33e77 · cd33e77
1 parent 45f441e
commit cd33e77
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/main/kotlin/com/williambl/haema/compat/emi/HaemaEmiPlugin.kt b/src/main/kotlin/com/williambl/haema/compat/emi/HaemaEmiPlugin.kt
@@ -2,6 +2,7 @@ package com.williambl.haema.compat.emi
 
 import com.williambl.haema.Haema
 import com.williambl.haema.api.RitualTableUseEvent
+import com.williambl.haema.core.BookOfBloodItem
 import com.williambl.haema.craft.BookOfBloodRecipe
 import com.williambl.haema.ritual.RitualModule
 import dev.emi.emi.api.EmiApi
@@ -41,7 +42,7 @@ class HaemaEmiPlugin: EmiPlugin{
 
     init {
         RitualTableUseEvent.EVENT.register(RitualTableUseEvent { _, world, _, player, hand, _ ->
-            if (player.getStackInHand(hand).item == Haema.BOOK_OF_BLOOD && world.isClient) {
+            if (BookOfBloodItem.isBook(player.getStackInHand(hand)) && world.isClient) {
                 EmiApi.displayRecipeCategory(RitualCategory)
             }
         })

diff --git a/src/main/kotlin/com/williambl/haema/compat/rei/HaemaREIPlugin.kt b/src/main/kotlin/com/williambl/haema/compat/rei/HaemaREIPlugin.kt
@@ -2,6 +2,7 @@ package com.williambl.haema.compat.rei
 
 import com.williambl.haema.Haema
 import com.williambl.haema.api.RitualTableUseEvent
+import com.williambl.haema.core.BookOfBloodItem
 import com.williambl.haema.craft.BookOfBloodRecipe
 import com.williambl.haema.ritual.craft.RitualRecipe
 import com.williambl.haema.util.SelfClosingScreen
@@ -29,7 +30,7 @@ class HaemaREIPlugin : REIClientPlugin {
 
     init {
         RitualTableUseEvent.EVENT.register(RitualTableUseEvent { _, world, _, player, hand, _ ->
-            if (player.getStackInHand(hand).item == Haema.BOOK_OF_BLOOD && world.isClient) {
+            if (BookOfBloodItem.isBook(player.getStackInHand(hand)) && world.isClient) {
                 ViewSearchBuilder.builder().addCategory(ritualId).open()
                 REIRuntimeImpl.getInstance().previousScreen = SelfClosingScreen()
             }

diff --git a/src/main/kotlin/com/williambl/haema/core/BookOfBloodItem.kt b/src/main/kotlin/com/williambl/haema/core/BookOfBloodItem.kt
@@ -12,6 +12,7 @@ import net.minecraft.world.World
 import vazkii.patchouli.api.PatchouliAPI
 import vazkii.patchouli.common.base.PatchouliSounds
 import vazkii.patchouli.common.book.BookRegistry
+import vazkii.patchouli.common.item.PatchouliItems
 
 class BookOfBloodItem(settings: Settings?) : Item(settings) {
     override fun use(world: World, player: PlayerEntity, hand: Hand): TypedActionResult<ItemStack> {
@@ -25,4 +26,10 @@ class BookOfBloodItem(settings: Settings?) : Item(settings) {
         }
         return TypedActionResult(ActionResult.SUCCESS, stack)
     }
+
+    companion object {
+        fun isBook(stack: ItemStack): Boolean {
+            return stack.item is BookOfBloodItem || stack.item == PatchouliItems.BOOK
+        }
+    }
 }
diff --git a/src/main/kotlin/com/williambl/haema/ritual/RitualModule.kt b/src/main/kotlin/com/williambl/haema/ritual/RitualModule.kt
@@ -2,6 +2,7 @@ package com.williambl.haema.ritual
 
 import com.williambl.haema.Haema
 import com.williambl.haema.api.RitualTableUseEvent
+import com.williambl.haema.core.BookOfBloodItem
 import com.williambl.haema.id
 import com.williambl.haema.ritual.craft.AddLevelsRitualAction
 import com.williambl.haema.ritual.craft.ChangeAbilitiesRitualAction
@@ -27,6 +28,7 @@ import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.registry.Registry
 import net.minecraft.world.World
+import vazkii.patchouli.common.item.PatchouliItems
 import vazkii.patchouli.common.multiblock.DenseMultiblock
 import vazkii.patchouli.common.multiblock.MultiblockRegistry
 import vazkii.patchouli.common.multiblock.StateMatcher
@@ -62,7 +64,11 @@ object RitualModule: ModInitializer {
 
     override fun onInitialize() {
         RitualTableUseEvent.EVENT.register { _: BlockState, world: World, _: BlockPos, player: PlayerEntity, hand: Hand, _: BlockHitResult ->
-            if (player.getStackInHand(hand).item == Haema.BOOK_OF_BLOOD && world.isClient && !FabricLoader.getInstance().isModLoaded("roughlyenoughitems") && !FabricLoader.getInstance().isModLoaded("emi")) {
+            if (world.isClient
+                && BookOfBloodItem.isBook(player.getStackInHand(hand))
+                && !FabricLoader.getInstance().isModLoaded("roughlyenoughitems")
+                && !FabricLoader.getInstance().isModLoaded("emi")
+            ) {
                 player.sendMessage(Text.translatable("gui.haema.message.no_recipe_viewer"), true);
             }
         }