From 4e353b9f3cd68e14ba0fddda2454a973cbecbf76 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 16 Sep 2018 21:37:20 -0400 Subject: [PATCH] add JEI for Crucibles, adding JEI for anvil --- .../primal/forgecraft/compat/JEI/ModJEI.java | 5 +- .../compat/JEI/anvil/AnvilRecipeCategory.java | 7 ++ .../compat/JEI/anvil/AnvilRecipeChecker.java | 7 ++ .../JEI/crucible/CrucibleRecipeCategory.java | 66 ++++++------------ .../JEI/crucible/CrucibleRecipeWrapper.java | 6 +- .../primal/forgecraft/init/ModCrafting.java | 17 ++--- .../assets/forgecraft/lang/en_us.lang | 4 +- .../models/block/emptycrucible.json | 21 ++++-- .../forgecraft/textures/gui/jei/cauldron.png | Bin 2085 -> 0 bytes .../textures/gui/jei/cauldron_progress.png | Bin 1762 -> 0 bytes .../forgecraft/textures/gui/jei/crucible.png | Bin 0 -> 1055 bytes 11 files changed, 72 insertions(+), 61 deletions(-) create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeChecker.java delete mode 100644 kfc/src/main/resources/assets/forgecraft/textures/gui/jei/cauldron.png delete mode 100644 kfc/src/main/resources/assets/forgecraft/textures/gui/jei/cauldron_progress.png create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/gui/jei/crucible.png diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java index 0bce5bb5..87e8ff53 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java @@ -5,6 +5,7 @@ import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.recipe.IRecipeCategoryRegistration; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.OreIngredient; import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeCategory; import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeChecker; import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeHandler; @@ -57,6 +58,8 @@ public class ModJEI implements IModPlugin // ***************************************************************************** // // Info // ***************************************************************************** // - //egistry.addIngredientInfo(new ItemStack(ModBlocks.nbtCrucible, 1, OreDictionary.WILDCARD_VALUE), ItemStack.class, "jei.info.forgecraft.crucible"); + registry.addIngredientInfo(ItemStack.EMPTY, ItemStack.class, "jei.info.forgecraft.crucible"); + registry.addIngredientInfo(new ItemStack(ModBlocks.nbtCrucible, 1, OreDictionary.WILDCARD_VALUE), ItemStack.class, "jei.info.forgecraft.crucible"); + registry.addIngredientInfo(new OreIngredient("oreIron"), OreIngredient.class, "jei.info.forgecraft.oreiron"); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java new file mode 100644 index 00000000..48309ed1 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java @@ -0,0 +1,7 @@ +package nmd.primal.forgecraft.compat.JEI.anvil; + +/** + * Created by mminaie on 9/16/18. + */ +public class AnvilRecipeCategory { +} diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeChecker.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeChecker.java new file mode 100644 index 00000000..02214ec5 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeChecker.java @@ -0,0 +1,7 @@ +package nmd.primal.forgecraft.compat.JEI.anvil; + +/** + * Created by mminaie on 9/16/18. + */ +public class AnvilRecipeChecker { +} 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 0c36b264..1c936617 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 @@ -1,17 +1,16 @@ package nmd.primal.forgecraft.compat.JEI.crucible; -import crafttweaker.api.item.IngredientAny; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import nmd.primal.core.common.compat.jei.AbstractCategory; import nmd.primal.core.common.helper.CommonUtils; -import nmd.primal.core.common.init.ModInfo; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.init.ModBlocks; import javax.annotation.Nonnull; @@ -22,17 +21,13 @@ public class CrucibleRecipeCategory extends AbstractCategory@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 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 deleted file mode 100644 index 04e4173846870690f8d704323bdd040ebdc76fda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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){ diff --git a/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/crucible.png b/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/crucible.png new file mode 100644 index 0000000000000000000000000000000000000000..574b94df417e032bbae3f2c9091379bc9bddb79d GIT binary patch literal 1055 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*&lHV2+Nr$9{JqDz`(r5)5S5Q;?~={8@&z(h%`Km zeyQ#8%<1{N%!A8cTwAWeBIE5Ie_HY8XDK@uS(Qc23B7Okp8UD*r00(C^Z7jmF?Zt}?wleTA+qhjeS^3(^oJ;uA11<-UyIB|n z7;rGWw)(tG7I(O8lE>T>8Nuo17uF>Dfh9pzf`#vZ!GYumPPWUBRTVfG6c`#97?>Ea zGaNRqVQD_FhDBLh`yf{Z(*_|PCiVo02Zlh=mmh@$@K_I$S`ZP|0Xo_T6%4cwo;c;TfoUEC$RUgpY!y7(2NSCHu(06u zJPU)yw5bUKGo~h_q^d?R`ZJtqzM9A3P!P7ekXN745g2qc8bANE`K=$-Vywi#=E5S- z@H#Zq^fzN?fm`1D`~SHn{GPpO)vA2vBCENRj1SFa`tVhHOUwL8xwn_SEqmQl(9f{u z`s*!GYd6WRc>nu+zxnL5zHG{eBn2DnEoJy_@?ZV_*Owj0?@XMgP_RyW7P9V{M z$DS$S2gq_@y#3Jq&5(8^%Y0p`szhWY=d*BdJkDs?{#<=}1A~j~zvI)x1sxcaq}u*} ze0nuifgw;CXDopO?9N%Er77ytH%nrl3k7+V##S?-rj7^pKb|j0nfm(u{R*ar4`S21 x>-l)*5lBM>;ukaJ;Y^Jrn*=wTCPpeODetqJ?|LKg#ybWe@O1TaS?83{1OUc;|L_0+ literal 0 HcmV?d00001