From 961fe1a6ebfa9ad9908e2e247492e9f5db4da458 Mon Sep 17 00:00:00 2001 From: lirelent Date: Sat, 6 Jul 2019 22:39:24 -0400 Subject: [PATCH] new Guidebook jar with fix for recipes so that background is drawn behind fix GCTRecipeProvider --- build.gradle | 4 ++-- ... => Guidebook-1.12.2-2.9.1.s5-sources.jar} | Bin 230941 -> 231175 bytes ...1.s4.jar => Guidebook-1.12.2-2.9.1.s5.jar} | Bin 327899 -> 328125 bytes .../guidebook/GCTRecipeProvider.java | 4 ++-- .../assets/arcanearchives/xml/tome.xml | 13 ++++++------- 5 files changed, 10 insertions(+), 11 deletions(-) rename embed/{Guidebook-1.12.2-2.9.1.s4-sources.jar => Guidebook-1.12.2-2.9.1.s5-sources.jar} (91%) rename embed/{Guidebook-1.12.2-2.9.1.s4.jar => Guidebook-1.12.2-2.9.1.s5.jar} (90%) 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 76f037612424595d9204f4d73d70add4aa196d34..d1aaf33ac7c5c7ebb0b5cf8954a2e9a13125b08f 100644 GIT binary patch delta 6504 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�Ce@NU@ME2sb+XU@XLg4L!epf=IA&M&_ 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 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 b7c59375a6298028de199d8e243175ccb27fbc62..0d3e6c322d6c3f231eefb5e572e2f74a2bd45658 100644 GIT binary patch delta 12024 zcmZ{K2RxPS|G#tG_DZ&l$jl})BNau+jxrOnw-62~G-RB(MP!R)9XhD&ky%K#Y_e(C z{OpDRdIADcQUcbpSV|!z^e%q` zeox?s-)qF-_jLv69V3F^A%rN{VT2S#hXQo)=et%&QA{JikAMd>#?asdF(Ev_oFpMe z9%+lAKamro&B-W_lGp)OOn8PJ)Byw{Nzb3B6xW6q&nEz3{YTdcsq$sM8EkgEB1u4Q5K%?#PWg znA-wSVNyk-;ACJsjF)5~&IeaN-UQMbL#HxRVRWv9;^yzx(}0C=P0%sSU09+phY`Cj43gU zp@5}lY|mpJSXsjp{xQd#yy=FEAl4=wN6*-1;pmWE5zb{DMh>0=c1MBkb@&AtW7-@` zak5~SEAX)0B^~Yn#x=kPW@BaoaTFAfLdc;xACiD$pP_O⪚@D^{4~bI~uC`KN5Nj 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 B$-)2t delta 11729 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 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 @@

Radiant Troves can be crafted on a Gem Cutter's Table.

-

- - - - - -

+ + + + + +