From d25777955fbc5f1a12bfeeaacaea2fbe03f6bcc8 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sat, 15 Sep 2018 16:35:12 -0400 Subject: [PATCH] jei crashing on load --- .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../JEI/crucible/CrucibleRecipeCategory.java | 8 ++--- .../forgecraft/crafting/CrucibleCrafting.java | 3 -- .../init/recipes/CrucibleRecipes.java | 18 +---------- .../forgecraft/tiles/TileNBTCrucible.java | 30 +----------------- .../assets/forgecraft/textures/gui/empty.png | 0 .../forgecraft/textures/gui/jei/cauldron.png | Bin 0 -> 2085 bytes .../textures/gui/jei/cauldron_progress.png | Bin 0 -> 1762 bytes 8 files changed, 7 insertions(+), 54 deletions(-) create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/gui/empty.png create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/gui/jei/cauldron.png create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/gui/jei/cauldron_progress.png diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index a6c04e4a..ab438e00 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -47,7 +47,7 @@ public class ModInfo { public static class Registries { // In-World Recipes - public static final IForgeRegistry CRUCIBLE_CRAFTINGS = GameRegistry.findRegistry(CrucibleCrafting.class); + //public static final IForgeRegistry CRUCIBLE_CRAFTINGS = GameRegistry.findRegistry(CrucibleCrafting.class); } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java index 05c5bb89..be52c2d5 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java @@ -43,7 +43,7 @@ public class CrucibleRecipeCategory extends AbstractCategory { +public class TileNBTCrucible extends BaseTile implements ITickable { private ItemStack drops; private int heat; @@ -130,35 +130,7 @@ public class TileNBTCrucible extends BaseTile implements ITickable, IRecipeCache return nbt; } - // ***************************************************************************** // - // IRecipeCache - // ***************************************************************************** // - private List recipe_cache = new ArrayList<>(); - @Override - public List getRecipeCache() - { - return recipe_cache; - } - - @Override - public CrucibleCrafting matchRecipe() - { - for (CrucibleCrafting recipe : this.getRecipeCache()) { - if (recipe.isRecipe(this.ingList.get(0), this.ingList.get(1), this.ingList.get(2), this.ingList.get(3), this.ingList.get(4))) { - return recipe; - } - } - - for (CrucibleCrafting recipe : CrucibleCrafting.RECIPES) { - if (recipe.isRecipe(this.ingList.get(0), this.ingList.get(1), this.ingList.get(2), this.ingList.get(3), this.ingList.get(4))) { - this.addRecipeCache(recipe); - return recipe; - } - } - - return null; - } } diff --git a/kfc/src/main/resources/assets/forgecraft/textures/gui/empty.png b/kfc/src/main/resources/assets/forgecraft/textures/gui/empty.png new file mode 100644 index 00000000..e69de29b diff --git a/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/cauldron.png b/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/cauldron.png new file mode 100644 index 0000000000000000000000000000000000000000..13b38ffc5c68e7517f25e6e89f3fed6039bb8cc7 GIT binary patch literal 2085 zcmdT_eM}Q)7=LRkFk_jBo62;%wK`?9?X}pJ7AlnXT3D@9?!xh!U5v*|*%6lVyachGAI zB*Tpt5m^N8C|iGuNCtpkOj>QM&9Yo;r`=MVvyuAT9_S4~a*EG`+nof9tR;#_N+-JW zORESW9Xin}r3JNk3`8-RUd|BN#&ESz z=F~C~GG@X$b)pa{n_m8Ou(F?AZIG8pt6 zkj98&8gwB*Z5ptt$`tMmS(Ip?FvsoW--mu-eTH=7_wE!Vhe63 zDNYg3H7Jy?kzmM=35SWH-N;ylwd5oWCd*uJGH5g?hA9n3Of>H6c#*2fAQ>4q9?y(R zSOsU06DNir9wyd@py19ha5;|lZ~P1ZL3V~wZ}oNE?7^u+@6Yn%Jmc5<2W}^w+~e*(@!`q-rnAc$ z-b$+6)9`B!-vmr|lYBK`vqn}RoWt9By*YKOIkGdgjTb26)qtkVw*ILc$=K*e9g8Xj z@WKq5)%OiMV+yYA-W8m8qv>L&Kc=tSdtp<1{YWFv43?m;4{rxpEtuZ>XMSDm;s?!s zn6mBhjD)jiayK-7pA?)q`^n{s{OE!Aq62Y%tX_Au>!Yg`jqz(%4|N1@)p_|xdS`zT z(KkY&&iRU!Pd@KDEjhO4*4{g}n>D=`;++0%X20fXO74+`w$|O!^)Z?I9}?}g=MRH~ zbHUcSoA)K4Z7R&T>{4GYtgHS>$)N+6^94Du4gU2{yN=bheRnM;P||nl)koqyUNKDh zsIGMW@ZDXltL_Q)`!;Q>1wibVSmn+@R3QC)Z`6W?4dBO!ccVdvW}r6IrPGAaS|I>) zc&@j_ejzRhM5TVfvpF|mkkc#OQ4x_G`RgM)+7F8Un(2xU(QfAECMD==S+l6}#&C4< zr$2S3b~kNrY&i%5IRZqM&#wYt3Wx#-@N>fEj-ESGJ}`$)6Y7^1UK(JW-!nMRi2uEO oG0p!0a!Nt$Sf?hq8t*R*098Jy`t8baB>ZoK3~YsQe_BD+Kczo;;s5{u literal 0 HcmV?d00001 diff --git a/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/cauldron_progress.png b/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/cauldron_progress.png new file mode 100644 index 0000000000000000000000000000000000000000..04e4173846870690f8d704323bdd040ebdc76fda GIT binary patch literal 1762 zcmdT_TWs4@7(Qvk8Zy>}Ax#4WH69X7!to`slUNDO#V*Z6N|y#Tpi%1Dr;V4|&TO|y zD_A=wb(@3$^rC8~+zHVGiAJ)pjD zWcmE(`2WBE`)~5e-k#@ncpvcs0CuFig)9IrB)WiS8`=(Xq!(YHC0IdZzm$&no=Xu%C{F0;NuV^J?4M4QBQj+8%w6P&LqUtgH z&V@@jrYbSKpUqI2QVJH-?nx8&P4?vE$)X%l@XlwkXoW`r8nh*>qK)bnUy0%CxIB`b zYZAxSRqSF6-yoIG^kON)gc$1&5Hdy67{~ePAj@&|GZ;hB3`wDfBj_N{ay%2l>I+BS zOl6qQ3SD(y=oG^Xwq4>$vRp3v%K^V(j*xUD5^*pXhCmvGHKE&5h0v|N4FmyNvZ==%iZiJwfGMOf@Zq*ZoQbty!5=r|hQq!Ec*0n7=3;&|AskW7yC_yp{ zEo01-Q9XwDHjGj3?(N7?L~QsMOcfPH8WjwAOoO_e7GgO1;#X9Kr|2-sVkk(37>Wzi zbeLfh5tiX7k!1r6lWbsYW=jh!m*l9V$c03j7DHh%ne1Y@M1rQ+R46DmY}2}BOS%jj zepTeRZkxELEuS)>WE*DAFh(04&|5HU!zvghEY-(hPiG`q)t!rdPJuS!6`-k(L#4|! zG;BS?yt)YkD)8^f1tAp<1w!g=YX-Dg|o&w-haU2RMH z>aF{*G`KypH~?n1RR_SXwrVZ)AvkzvZKh+^T|JGI&};Tp*8`nTwpYhimp`t40^U*D zzTP>xaR1fq@fyg3vsKcO8ucK4&3fi+(gy!hzPN1hs7ed0>{nT{jnsqWn%4yNC9{kZ74 z>WaVi&986&)^&zi^DX4}ANDSJfd^n<8i1Cq5w;Gg$>{$8iGjC(8~9MB(T`xOgsnqr fGWrLk=O>~H+E1MPW6$N0L4a0T>=Di-2jBP;v+u){ literal 0 HcmV?d00001