From a966671e4548287308acf4f626ff5e1df3b1b88c Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 8 Dec 2021 10:45:57 +0100 Subject: [PATCH] disabled Patchouli until they release a 1.18 version --- build.gradle | 2 +- src/main/java/ru/betterend/item/GuideBookItem.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ca626f61..f3d07a80 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - useApi "vazkii.patchouli:Patchouli:1.17-${project.patchouli_version}" + // useApi "vazkii.patchouli:Patchouli:1.17-${project.patchouli_version}" println "Using local BCLib: ${local_bclib}" if (local_bclib){ implementation( project(path:":BCLib", configuration: 'dev') ) diff --git a/src/main/java/ru/betterend/item/GuideBookItem.java b/src/main/java/ru/betterend/item/GuideBookItem.java index 39e69ed5..6a1fab05 100644 --- a/src/main/java/ru/betterend/item/GuideBookItem.java +++ b/src/main/java/ru/betterend/item/GuideBookItem.java @@ -1,5 +1,7 @@ package ru.betterend.item; +import java.util.List; + import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -15,9 +17,6 @@ import ru.bclib.items.ModelProviderItem; import ru.betterend.BetterEnd; import ru.betterend.registry.EndItems; import ru.betterend.util.LangUtil; -import vazkii.patchouli.api.PatchouliAPI; - -import java.util.List; public class GuideBookItem extends ModelProviderItem { public final static ResourceLocation BOOK_ID = BetterEnd.makeID("guidebook"); @@ -33,7 +32,8 @@ public class GuideBookItem extends ModelProviderItem { @Override public InteractionResultHolder use(Level world, Player user, InteractionHand hand) { if (!world.isClientSide && user instanceof ServerPlayer) { - PatchouliAPI.get().openBookGUI((ServerPlayer) user, BOOK_ID); + //TODO: reanable Patchouli once it is available for 1.18 + //PatchouliAPI.get().openBookGUI((ServerPlayer) user, BOOK_ID); return InteractionResultHolder.success(user.getItemInHand(hand)); } return InteractionResultHolder.consume(user.getItemInHand(hand));