diff --git a/build.gradle b/build.gradle index 5555cc2a6..ddddeda6a 100644 --- a/build.gradle +++ b/build.gradle @@ -127,8 +127,8 @@ dependencies { //deobfCompile "com.enderio.core:EnderCore:1.12.2-0.5.58" // modified guidebook, note "lirelent" package - deobfCompile "gigaherz.lirelent.guidebook:Guidebook-1.12.2:2.9.1.s4" - embed "gigaherz.lirelent.guidebook:Guidebook-1.12.2:2.9.1.s4" + deobfCompile "gigaherz.lirelent.guidebook:Guidebook-1.12.2:2.9.1.s5" + embed "gigaherz.lirelent.guidebook:Guidebook-1.12.2:2.9.1.s5" compileOnly 'thaumcraft:Thaumcraft:1.12.2:6.1.BETA26' diff --git a/embed/Guidebook-1.12.2-2.9.1.s4-sources.jar b/embed/Guidebook-1.12.2-2.9.1.s5-sources.jar similarity index 91% rename from embed/Guidebook-1.12.2-2.9.1.s4-sources.jar rename to embed/Guidebook-1.12.2-2.9.1.s5-sources.jar index 76f037612..d1aaf33ac 100644 Binary files a/embed/Guidebook-1.12.2-2.9.1.s4-sources.jar and b/embed/Guidebook-1.12.2-2.9.1.s5-sources.jar differ diff --git a/embed/Guidebook-1.12.2-2.9.1.s4.jar b/embed/Guidebook-1.12.2-2.9.1.s5.jar similarity index 90% rename from embed/Guidebook-1.12.2-2.9.1.s4.jar rename to embed/Guidebook-1.12.2-2.9.1.s5.jar index b7c59375a..0d3e6c322 100644 Binary files a/embed/Guidebook-1.12.2-2.9.1.s4.jar and b/embed/Guidebook-1.12.2-2.9.1.s5.jar differ diff --git a/src/main/java/com/aranaira/arcanearchives/integration/guidebook/GCTRecipeProvider.java b/src/main/java/com/aranaira/arcanearchives/integration/guidebook/GCTRecipeProvider.java index dc2927be0..2c669ee93 100644 --- a/src/main/java/com/aranaira/arcanearchives/integration/guidebook/GCTRecipeProvider.java +++ b/src/main/java/com/aranaira/arcanearchives/integration/guidebook/GCTRecipeProvider.java @@ -17,12 +17,12 @@ import java.util.ArrayList; public class GCTRecipeProvider extends RecipeProvider { - public static final ResourceLocation BACKGROUND = new ResourceLocation(ArcaneArchives.MODID, "textures/gui/jei/gem_cutters_table.png"); + public static final ResourceLocation BACKGROUND = new ResourceLocation(ArcaneArchives.MODID, "gui/jei/gem_cutters_table"); @Nullable @Override public ProvidedComponents provideRecipeComponents (@Nonnull ItemStack targetOutput, int recipeIndex) { - return null; + return provideRecipeComponents(targetOutput.getItem().getRegistryName()); } @Nullable diff --git a/src/main/resources/assets/arcanearchives/xml/tome.xml b/src/main/resources/assets/arcanearchives/xml/tome.xml index 1023ef6a8..5dd5be752 100644 --- a/src/main/resources/assets/arcanearchives/xml/tome.xml +++ b/src/main/resources/assets/arcanearchives/xml/tome.xml @@ -554,13 +554,12 @@
-