diff --git a/build.gradle b/build.gradle index 00cc82ff..863b5509 100644 --- a/build.gradle +++ b/build.gradle @@ -86,7 +86,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" - //1.19.3 modApi "vazkii.patchouli:Patchouli:${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 0d0aa2e1..3f534c68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,9 +18,9 @@ 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=1.19-73-FABRIC -bclib_version=3.30.0 -rei_version=14.0.680 -emi_version=1.0.3+1.20 +patchouli_version=1.20.1-84-FABRIC +bclib_version=3.0.14 +rei_version=12.0.622 +emi_version=1.0.28+1.20.1 trinkets_version=3.7.0 -cca_version=5.2.1 +cca_version=5.2.2 diff --git a/src/main/java/org/betterx/betterend/item/GuideBookItem.java b/src/main/java/org/betterx/betterend/item/GuideBookItem.java index 06e43b22..0a1613c5 100644 --- a/src/main/java/org/betterx/betterend/item/GuideBookItem.java +++ b/src/main/java/org/betterx/betterend/item/GuideBookItem.java @@ -8,6 +8,7 @@ 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; @@ -16,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 { @@ -32,10 +35,10 @@ 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)); -// } + 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)); }