diff --git a/build.gradle b/build.gradle index d4abfac69..5b36b0a98 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,7 @@ test { dependencies { minecraft "net.minecraftforge:forge:${mc_version}-31.1.24" - compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-28.146") { transitive = false } + compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-29.153") { transitive = false } compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") diff --git a/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java b/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java index 1147a1518..9ea8dc454 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java @@ -89,7 +89,7 @@ public class RecipeManaInfusion implements IManaInfusionRecipe { @Nonnull @Override public NonNullList getIngredients() { - return NonNullList.from(input); + return NonNullList.from(null, input); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 4e7bfad2c..75d2b296a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -32,11 +32,10 @@ import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.common.advancements.UseItemSuccessTrigger; import vazkii.botania.common.lib.LibMisc; +import vazkii.patchouli.api.PatchouliAPI; import vazkii.patchouli.common.base.PatchouliSounds; import vazkii.patchouli.common.book.Book; import vazkii.patchouli.common.book.BookRegistry; -import vazkii.patchouli.common.network.NetworkHandler; -import vazkii.patchouli.common.network.message.MessageOpenBookGui; import javax.annotation.Nonnull; @@ -89,7 +88,7 @@ public class ItemLexicon extends Item implements IElvenItem { if (playerIn instanceof ServerPlayerEntity) { ServerPlayerEntity player = (ServerPlayerEntity) playerIn; UseItemSuccessTrigger.INSTANCE.trigger(player, stack, player.getServerWorld(), player.getX(), player.getY(), player.getZ()); - NetworkHandler.sendToPlayer(new MessageOpenBookGui(book.id), (ServerPlayerEntity) playerIn); + PatchouliAPI.instance.openBookGUI((ServerPlayerEntity) playerIn, book.id); SoundEvent sfx = PatchouliSounds.getSound(book.openSound, PatchouliSounds.book_open); playerIn.playSound(sfx, 1F, (float) (0.7 + Math.random() * 0.4)); }