From cc3046a0219cec408fa85af07114e058fa6a2a35 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 20 Dec 2023 17:22:19 +0100 Subject: [PATCH] Disabled Patchouli --- build.gradle | 3 ++- .../org/betterx/betterend/item/GuideBookItem.java | 13 +++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 863b5509..ed570a6c 100644 --- a/build.gradle +++ b/build.gradle @@ -86,7 +86,8 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" - modApi "vazkii.patchouli:Patchouli:${project.patchouli_version}" + //Disabled, no 1.20.3/4 version available +// modApi "vazkii.patchouli:Patchouli:${project.patchouli_version}" println "Using local BCLib: ${local_bclib}" if (local_bclib) { implementation(project(path: ":BCLib", configuration: 'dev')) diff --git a/src/main/java/org/betterx/betterend/item/GuideBookItem.java b/src/main/java/org/betterx/betterend/item/GuideBookItem.java index 0a1613c5..c68028bf 100644 --- a/src/main/java/org/betterx/betterend/item/GuideBookItem.java +++ b/src/main/java/org/betterx/betterend/item/GuideBookItem.java @@ -8,7 +8,6 @@ import org.betterx.betterend.util.LangUtil; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; @@ -17,8 +16,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import vazkii.patchouli.api.PatchouliAPI; - import java.util.List; public class GuideBookItem extends ModelProviderItem { @@ -34,11 +31,11 @@ public class GuideBookItem extends ModelProviderItem { @Override public InteractionResultHolder use(Level world, Player user, InteractionHand hand) { - //TODO: 1.19.3 Re-Enable once patchouli is available - if (!world.isClientSide && user instanceof ServerPlayer) { - PatchouliAPI.get().openBookGUI((ServerPlayer) user, BOOK_ID); - return InteractionResultHolder.success(user.getItemInHand(hand)); - } + //TODO: 1.20.3 Re-Enable once patchouli is available +// if (!world.isClientSide && user instanceof ServerPlayer) { +// PatchouliAPI.get().openBookGUI((ServerPlayer) user, BOOK_ID); +// return InteractionResultHolder.success(user.getItemInHand(hand)); +// } return InteractionResultHolder.consume(user.getItemInHand(hand)); }