From ec50c13ed2664a53384aefdc2987d60f855d2557 Mon Sep 17 00:00:00 2001 From: Daturachan Date: Fri, 10 Jun 2022 15:05:53 +0200 Subject: [PATCH 1/3] Add files via upload Re-added Patchouli integration --- src/main/java/ru/betterend/item/GuideBookItem.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/betterend/item/GuideBookItem.java b/src/main/java/ru/betterend/item/GuideBookItem.java index 91971e54..c155f5da 100644 --- a/src/main/java/ru/betterend/item/GuideBookItem.java +++ b/src/main/java/ru/betterend/item/GuideBookItem.java @@ -15,6 +15,7 @@ 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; @@ -32,8 +33,8 @@ 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)); From 2c0e37fe59761cb87014c983c94c75417d1457a6 Mon Sep 17 00:00:00 2001 From: Daturachan Date: Fri, 10 Jun 2022 15:06:54 +0200 Subject: [PATCH 2/3] Add files via upload Re-added Patchouli integration, changed maven url to 1.18.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 629e5698..4fa29ec6 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,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.18.2-${project.patchouli_version}" println "Using local BCLib: ${local_bclib}" if (local_bclib){ implementation( project(path:":BCLib", configuration: 'dev') ) From 3be95dac0a30441224690f6025a7cd55f5d7a2d5 Mon Sep 17 00:00:00 2001 From: Daturachan Date: Fri, 10 Jun 2022 15:07:58 +0200 Subject: [PATCH 3/3] Add files via upload Updated Patchouli version to 1.18.2-69-FABRIC (latest as of commit date). --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b6120382..1318e413 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ 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 +patchouli_version = 69-FABRIC bclib_version = 1.4.3 rei_version = 8.0.442 canvas_version = 1.0.+