From 372d7ddd13cbe4c38d85d8e9f16fee9b75f2bd69 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 30 Jun 2022 15:30:20 +0200 Subject: [PATCH] [Change] Re-Enabled Patchouli --- build.gradle | 2 +- gradle.properties | 6 +++--- src/main/java/org/betterx/betterend/item/GuideBookItem.java | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 20d34c2a..177833f1 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,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}" + 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/gradle.properties b/gradle.properties index 7f98de4d..7b4516c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,8 +13,8 @@ maven_group=org.betterx.betterend archives_base_name=better-end # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -patchouli_version=55-FABRIC-SNAPSHOT -bclib_version=2.0.6 -rei_version=9.0.472 +patchouli_version=1.19-73-FABRIC +bclib_version=2.0.7 +rei_version=9.1.500 trinkets_version=3.4.0 cca_version=5.0.0-beta.1 diff --git a/src/main/java/org/betterx/betterend/item/GuideBookItem.java b/src/main/java/org/betterx/betterend/item/GuideBookItem.java index cf820b4d..6fe5b6f9 100644 --- a/src/main/java/org/betterx/betterend/item/GuideBookItem.java +++ b/src/main/java/org/betterx/betterend/item/GuideBookItem.java @@ -17,6 +17,8 @@ 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 { @@ -33,8 +35,7 @@ public class GuideBookItem extends ModelProviderItem { @Override public InteractionResultHolder use(Level world, Player user, InteractionHand hand) { if (!world.isClientSide && user instanceof ServerPlayer) { - //TODO: reanable Patchouli once it is available for 1.18 - //PatchouliAPI.get().openBookGUI((ServerPlayer) user, BOOK_ID); + PatchouliAPI.get().openBookGUI((ServerPlayer) user, BOOK_ID); return InteractionResultHolder.success(user.getItemInHand(hand)); } return InteractionResultHolder.consume(user.getItemInHand(hand));