From 966e404218d228df2fa7f99f4e9042d0ee34b0ff Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 20 Mar 2021 22:38:46 -0700 Subject: [PATCH] JEI Style Tabs --- build.properties | 2 +- resources/assets/nei/lang/en_US.lang | 27 +- resources/assets/nei/textures/nei_sprites.png | Bin 31651 -> 37711 bytes src/codechicken/nei/LayoutManager.java | 16 +- src/codechicken/nei/LayoutStyleMinecraft.java | 18 +- src/codechicken/nei/NEIClientConfig.java | 13 +- src/codechicken/nei/NEIModContainer.java | 8 +- src/codechicken/nei/api/ItemInfo.java | 2 + src/codechicken/nei/config/HandlerDumper.java | 110 ++++ .../nei/config/OptionToggleButtonBoubs.java | 64 ++ src/codechicken/nei/recipe/GuiRecipe.java | 105 +++- src/codechicken/nei/recipe/GuiRecipeTab.java | 563 ++++++++++++++++++ src/codechicken/nei/recipe/GuiRecipeTabs.java | 174 ++++++ 13 files changed, 1051 insertions(+), 51 deletions(-) create mode 100644 src/codechicken/nei/config/HandlerDumper.java create mode 100644 src/codechicken/nei/config/OptionToggleButtonBoubs.java create mode 100644 src/codechicken/nei/recipe/GuiRecipeTab.java create mode 100644 src/codechicken/nei/recipe/GuiRecipeTabs.java diff --git a/build.properties b/build.properties index 0fccf2de..9e413f13 100644 --- a/build.properties +++ b/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.4.1614-1.7.10 ccl_version=1.1.3.138 ccc_version=1.0.7.+ -mod_version=2.0.11-GTNH +mod_version=2.1.0-GTNH-beta diff --git a/resources/assets/nei/lang/en_US.lang b/resources/assets/nei/lang/en_US.lang index 6267d226..1746cfb5 100644 --- a/resources/assets/nei/lang/en_US.lang +++ b/resources/assets/nei/lang/en_US.lang @@ -48,10 +48,15 @@ nei.inventory.dusk.set=Set time to dusk nei.inventory.midnight.enable=Enable midnight-dawn nei.inventory.midnight.set=Set time to midnight nei.inventory.heal=Heal the player -nei.inventory.gamemode.0=Set gamemode to survival -nei.inventory.gamemode.1=Set gamemode to creative -nei.inventory.gamemode.2=Set gamemode to creative+ -nei.inventory.gamemode.3=Set gamemode to adventure +nei.inventory.current.gamemode.0=Current gamemode: survival +nei.inventory.current.gamemode.1=Current gamemode: creative +nei.inventory.current.gamemode.2=Current gamemode: creative+ +nei.inventory.current.gamemode.3=Current gamemode: adventure + +nei.inventory.gamemode.0=Click: Set gamemode to survival +nei.inventory.gamemode.1=Click: Set gamemode to creative +nei.inventory.gamemode.2=Click: Set gamemode to creative+ +nei.inventory.gamemode.3=Click: Set gamemode to adventure nei.chat.gamemode.0=You are now playing survival nei.chat.gamemode.1=You are now playing creative @@ -88,6 +93,7 @@ nei.options.keys.gui.next_machine=Next Machine nei.options.keys.gui.prev_machine=Prev Machine nei.options.keys.gui.search=Focus Search Bar nei.options.keys.gui.bookmark=Add Bookmark +nei.options.keys.gui.hide_bookmarks=Toggle Bookmark Panel Visibility nei.options.keys.world=World nei.options.keys.world.chunkoverlay=Chunk Boundary Overlay nei.options.keys.world.moboverlay=Mob Spawn Overlay @@ -102,6 +108,12 @@ nei.options.keys.world.creative=Gamemode nei.options.keys.world.creative.tip=Cycle Gamemode nei.options.inventory=Inventory +nei.options.inventory.bookmarksEnabled=Bookmarks Panel Visibility +nei.options.inventory.bookmarksEnabled.true=Visible +nei.options.inventory.bookmarksEnabled.false=Hidden +nei.options.inventory.jei_style_tabs=JEI Style Tabs +nei.options.inventory.jei_style_tabs.true=Yes +nei.options.inventory.jei_style_tabs.false=No [Weirdo] nei.options.inventory.widgetsenabled.true=NEI Enabled nei.options.inventory.widgetsenabled.false=NEI Disabled nei.options.inventory.cheatmode.0=Recipe Mode @@ -178,9 +190,10 @@ nei.options.tools.dump.itempanel.mode.2=Json nei.options.tools.dump.itempanel.mode.3=PNG nei.options.tools.dump.itempanel.icon.dumped=Item Panel icons were dumped to %s nei.options.tools.dump.itempanel.icon.cancelled=Dump cancelled - - - +nei.options.tools.dump.handlers=NEI Handlers +nei.options.tools.dump.handlers.dumped=handlers were dumped to %s +nei.options.tools.dump.handlers.mode.0=CSV +nei.options.tools.dump.handlers.mode.1=Json nei.recipe.page=Page %s/%s nei.recipe.tooltip=Recipes diff --git a/resources/assets/nei/textures/nei_sprites.png b/resources/assets/nei/textures/nei_sprites.png index 1221b87765527d083d039e8ceee3daaf16c9a86e..ff51bbd91827ee4ed5510c35674fec2ce528d6f0 100644 GIT binary patch delta 14113 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 delta 8332 zcmYjybyU<**Y!{Wl8PeT2#COtGvpv8Bi$+8Al>x?C8QCgOQfYsxPAn&<@G(A_=rt+|5x948?EN@8HU7#)v}>_O6)aZ8q3id zeeo~!eZ$Qyy|G8#nP&ZxoP9*4$S!-LvG28i%!Rcw>h5Z-)L;CjWh>|K#bXuxxDy|s zYjcYi?S20%w4LsB9dfrL1#`?s92##M^L)JzCkR-SHV zdV&n}kE-R4J57X_Y!lGN02IHy2?TD3wrcOsZ%^GYmS5euZ|yI8-7lWjxWQons_~Bw z#-aF~5qjToTCRQ$Q5fj3aTjyJ^@HQEh-$eXrgXQOa!Kd!Pb+o_@C z5YBcHE@#c1oHv3VxHzqB-C3e#9V`J5kse9x(9+MN8@Ktx^V{<6#mTZlYAZ~VM^*dj${?%pmT-P7X@gF~w zlv;?hl=MH$>DQ9q3M!SQ>+{z-_H0fTAS&8C_S)hk-cn+A?AY|k(VGtsD6#2e`}>}R z3G3+9>`qK2m$&z)w}=^dE;i5qT)db${mP8{7pEG>asG}?FPHCA8iQUCa9 zHxG}D@|`{Y@Sf=TlymEB1vXMEHl3+=F;D8Q=w>aFoc5FUwE?2hO$4GlCKcs>mCMuY z>-n$Tl?~R#yz=MUhMRRIN2C}zBI{(cMkP467dX8vqdYY+DFe@2wdcxwEp&6)F=PF; zB)}h{N74D>AYB~Sg4e2UlS>g#E7Xwe?I21Ut~7;gqm0I7^RqoQ>+mu}$-ZzsEw1WT zO(>QpZmAQd2@tJN?xUD$vgZh4#5oopGeWJO?vqD7@=hFKv9P zeL`2W)zsE|ZbFYhRk$ZyWLIsgHo`}I;@o!WD^b#;+*(Br4V^$CJN=u%JKv_clY?^J zngU<V#!EvRmhBmgEWzk&rs!fq9v6RM+@T`tx z5`*|ve5lc&hNzp4jy#jM-dj;rsM96>dd&FV5#iK+HL)DA-_xh~QAkr#a>7#m8?28) zRq&_&eIhf2-RTr7#Nd|@(Wn4J&oWM{;MGcsV!*}V@Q4RH9dlnLy&VU0Had7(7z;Nz z>x_h+^3Xuz4~{p^6>*)fU!kj6HmmLueu zM*)cRf1Fms?HqK^Y18UdHjSRA^JCx3|I~~v$q}`w7};Ew^>^G zj64!Gho@aFsYa}Hwtf5Ssx;n9g~|7)zMgSI(39eP{?zh)Y2!GbC*zG{SRMuk*zkHc zFqoJpEIO6<(mjz}q!Q;#=J+X=SFh;#(i`BDMyVP$sWQ&XAZ5kpm-3U*uH|mB4SX8` zAaCw!{iBs1SF2jja=0)FL`&)yE+2t7 z?E=Z-z_gzyrh-JfjbDe8A&pd%7>E@zb*tB^{<9>ReHFB4R}{${r1L$UuL(n?u?m0F z2z1(ja?4-($yxLCl#Pqp<5|Ctd(=0sgC~W0mI^kqB0Bw!7qn9NoDd|)sy&ZP$HV21 z>ifsq8n|*W!yJSyq(NQmmnb67_@W!ISd#AX5gm?yg*5x%PHVOL6IEf5=Bkyc#(+(e z`)eUYqA}>5&#kLC9bIvOQnGjM3X5&vy`4Dh2akKdgwxFP*-UEQZi&p_kdN6w&n+eX zir{7;2Lq7Z{Y^8Wp)>llgf;-z>oT>Y{nn2&ynA3?j0tCd+RxKO**U$Pyq&37b_io& zlS-<`n?hOYX>1M2carJDl?uVXgS)2tyMpo&1yYR8LRgAM;&*K%Z zGCSC7rObJG!$CNlysO0J9DM~;B)*l_I!b=ID3D#~n6c6`{?q$;>i zy<6Y>UonXozNB^P=MbH}cBOGxGn-e)-P?eYPu(}Wf^quXQjZr*;^$Je@aNoLxv@u( z&`@_U3`ZuLpeOkx;#O7>;IatYN;#hKW*1$tW6(c+a~7KYm@s zb=nWmq_n{{!uE`OrAbF2Qc=*wnx8ZDS>`LqeW;)6XqLt6n>YoxY^2!2luc@6O@f1s zYe>tC&&m~re3zCQuh{0N8;tf)6cFf81Q-qc{3Z&T_vltBuBB$F85T0Du3MA{|a zvO=8e;}=r7ym)1iChkWnqHB$-n8l=yI>?wjn0M_+x@)mY__eBz6q_&6DxTFr4b$H) z*l2P|NZn@*#ivQy=^01wY&sQ#OS>BxF{%V>yaw$(zBy0)D^Vf;Th&i2rN#ex^7Wwd z4X;lV-`wQ+H%hQG&^ZI?WwwDE=Z8ZtbKfvzsC=xT`SIBA%0y>^o!~C-Y9#f^0`A)5 zhp`0~{d~4;T=Y1`EVJS7dDT0-zO7%4(vvAZfen#gG+vKX!`U(KGft|w!;PErZ@P6h zWDMEW#@V8AzfpFQGVv1;^5(5Scxt67%tZW)APw2t!bi2Yzz>%bolF}y-$6}EAcRg5 z+`Dm_*o5BU?MbgSoOr?YI+gt_>yiS)nrwK!?>80U0515`vk15uF)e5?*vh($HTA_Y zl!92hedbVtQsNwny%LE}-LgjN4s%R(E5)Q8|4E_!M+-ySJih8;HSwiU*iMahHU^-Bsc!gh@U`e8gypS6UY35If+nkI_|w#sivyMc%p>dfm zh)C;~8%#LK{wtnBgMDAu!f+q)RS}X&aCZ$j^Ikn08XkPJh8IHoFAmPi$4hOI=gdgz zzKy!2A+b2&x5eWvVdqL^o=geO>y?u9d#=#S^i*T8ck0PUKj!cMzBqGQ|9y647jKqH z8e=_HGy>p0>dm^&z}@aOA$uPB(U=S?)mz!hA37+{B3B;4MJYX^r(rH9g7ng?_9|1k>`ReNW*x z@}*}DHf*Ed<}eu<=k6tX^+M@(s5HnfErqZydX3g*aPa8|Fkt?;usZWBCImv%X7)RB(Su zV(`(GW)cp)QCBpRXD=jj>|ewk_G>!{3jPd~K=K3M@*IU$(Fd9J|K_Lgl8XuZ(&-`u zrLRzsJZ!f}P$ezE8{d1A9>IinUeMR$`8b<7VKgmX=dm815}$rg+agqvh4mfHeOKnX zY3Ade_X@sMt!tJPuh(8uBq|&q9gXZfCYClM`Hy&mPpAk&TT?*SXLq5cG`t-k$PXB5Zvm6&~%=V+G7+MVSdtlfA? zK=+Kqhj;D?im{VC9P2Csi4*L(kFS??Ms~$U25Mra+M}+dWSF%p zNs7xNC?%|xNsG^J*=_KRr!FjPI6T)1pj_!5XZgu=*3nC!#ZZOqWV-abFTu%DX_kr6 zH}xxy$(twH9K_H1{X?*SE#UZ97kK~ui5W_`9_*%z#T<@HW|3uqe<$z8v! znz*d+uFZE<^ZqJ{8CC7X80Wu@368(dJ*Q%!6Grs_1OFzfe_&4|7OAUY8Tt zjeqm|Pf(MZIzzcjO<2u5+4#<#!3t2megW0Wz!l%aS|aG7-t8frmf@}l#wFy@e8WsC z`Qf9n-m_7|X8BO+6Zys7X9tY1@XwcTy$|9HZ-0C1@e3Xo)h) zS9C7xiY8rwT1=-DGec0_zVnTXOoq&aLYTN*O<)^@!_Tkkm#6x_&ekL-s};~a4x~V* z7#7UWvg&JSCM4-32?*f2a_{i#F1xu{tv)=wNIcz0wLXs%5p6lFgjIxUDZcbCSzC3Q zJVLqWMYQ7yBFx+0Zx}~uVTZ=g3L6G$LlV1bq?Aho5&#>rR>)5u239drrZnoI=dT#Q{2?ui zZMFXD@)Jrm%-AMVUSV@Euel}f|0$v3YHMxlXzC#2WbW}H(UFpr*+RhF)Cz3LC1?RQ;}Q^h-~kmD z;^VS{2!e(91TD?Y%)p7cl+r|kP$4J;{E+46h49uMQ{rJV3xX|#g@mk3xgh2b%msM) z9~!aXf9L@sY%VNd#cyE_uBD+V!pHt6(>GK5i`Dos{$G#_$mIf;ku#A8%z#IVO^KTm zk=9hJ115t3M&^4Gd!j)AdTYi7nNkn8flr25u_`I3v8UkFzkXljA#47z3p={nHof1- zB4GRjkE9ua2fbTT1C`Wa#wE%u}(k3$$1VI@=YneKeWm`^x9on;DJjo@n)$suoC> zrJJec!?hE)O_sfHYUN&jRXHM*MoT)?wv?U|rLDlipg7wgG2xJFPhwD%}mIdc8? z%13{%!@ZOKJ{1c`-mlUuJ6UM3&)k}9DH8L z%rYMU^;~Z)o9qz?L=p&>d81kPZEJs~LvJ(mMcmd++`-7w-7i<)Vj-(v_rD8!zl%(8 z9PLxo4Lg@7v*j#h;I`j6FZm$mYl;^W(dnf+7Ck6?x4J_as*%m1z}kb3eM(ia=QwForYZU1r%%B6iD zzkbFwF$YuqDay3iv_;LV^DKiGqfyaAzax-gfJ9?mvzfDgFk!cyWj>*m87@BMUvbmi zG&X&a>G-vNvncU4AOU4dTfHZ~h1)+R-h(o)--^mT5w%QfD3VXVLj}Yvy+8|{QXRem zhF-r)_i3)~*t*hm_3{gSUpZVESgWf^OLe_(5S0zPx(}($Jg-3a9Ry$fz<-2R&dVNS znf)@YcSm4ny3kGtj$dzqOC+z8+18&c>1XUBdlLeqA~ z?3II1zGo^)DaRkwNfc`|(bVboJW+r(1a5yf*8cB%Q z_cv|)4awF|YcO0)$qFamG6B58?8|9adrGXpNi-h}zvL@2ABf{@=Umk;2g zT{jIL12!W4l>4Z2aZo~q9V@{m%3}84)eekC-$%||zf{h*ju(NkLiLim!$(kd93R@` zZ+U<72}nhV)i9R=XE5e3=zD4>iH_&+o2QcLdFi)bWjPCW=mg^%4*j$}EiJzBy!Fsg zG&kg2Nd*}ek_8=l2G*`~wot*Rr$Nb}R_{*R|(YUpI6}v`=T&QJs~+OLs;t zJLbDsjNzqPht(15OcQ@6hLM+~Z?wjL>ExvE_L>ZJ8T_f1w=BponMf%>sny24ic;Bsb1<%7=FL3%o zW$jff8xl#peefl>YOZGw4h@*!l-@#P0D^6+WS@8M?^CCLxo#0UN@K|d$G8$HFoNRec zyFWzGR>TK@|JscBy-NDhak-t`RZ=(FlEX=UsE8SO+dC=z*H56seMo86`7ZsnJ{0EU zdv{GpNVs{tI96D>)cDOjIMK&*^26*!7$impy+sR;ox=j3NOSWS-Ymv-^4t_%~}kr)1zG$>%}WmZApJ;8;R&UE%Rr5%mFx1IOs zzXI`3hl3|buNOL=%L!eB$M>Zf^xUs-k(}wM3N@$Y?`4`PNtGq774`$^H_hZEfyM0M z9cdN@Y5umwyw+P^u4~$Xn-k;A%X*UgjmyUSIhLW9x_6Mt=KH%ImbcuVNAwVUXzF@b zT`ce<@LSup@t1XRTiJu<+4=^rOQ|><&xPA9gD^TDbT~1&Q|pEdBKMPu)-FocQVm{P zy4U;XhZfszoWvZkhh=;&WcG+GNMN3R*SZ_^{q-CK%^`{vW<%H?0GpliAl2*QYNg-cX z%*YVm&cWW;K=7)-(DVw-_td0l`}b1lcWCL8KQf6y?Q3lOP-x~068a%&(ZKjV0$|H} zBa)L(z)(R&#jAAWh?S4;C`I`2ZZNAH&+>FQ&il-zotG@=WdD~4+Ee?sas_fF+K__6 z6}n*CSrA0FnwKz*(CoJFK(?}=_tuE_i+&ojiYjvlVHY082pav`&BCehhN&NSH&M|6 zXmZ@<=?eSTenUO>EjdtaO0g<2!15~g-N{}LYLh>FkMrK~(jEN*y?UBMd6@@m_d5d_ zjPxREGi+&>TUO-6d3f<>a5 z_}y^ME(S;kx_*aHC)2#Ew+T=+tUuC>Y-hs7O|fv%qeMW9hX zwot6Rhmc2nP>5>ej0DIW-Ra7uIS~C~SD!BKXDqLmTmqp=amNIEdb(%hOPcS$3-oVU zj;1@~KNiOreH`Y^s*D+yxZj-mV!kvT=2O+=d{EQ#sm+TgN3@FjAi1uTJZqRg=A9*a zrKao^NpxCrGTdcq!MyKuM6T&@{o`PI#qN^UtSTaBe2& zwjqJ(ethNj%b#rfmQ#Ae1c&V5vBi9 zjb)3&6Uq%5l;0i<<=zXku{JDv8YHa8iX!C`7My#CvRGE6I+kUXA|x&l8|Q~Oo9;_*Sqp>x54XTnb+~Z`_3f{ z5IzWW{g^Au!U@eRT1;$19q}^ zd7U8y#{{u}K%HgpKq8z6X%D{x4(jCt&X0n3TF|9svzSZ(Cvo!s|4^YbtHk7JlNoIe zsiM|XaN4mSPT?#3)Vlk|Hp~Rje`tUWo(3t0w;yNS6b=#oj-iIcHu){Pm-PbH4`vu{ z#x}WK5xws4LM{kzd^%D@q+ma=vig7t_B~o`^*Q~m);W%KqM5OC4FYpM4T^Y#7#9aU zXqx#TuF5Qf*d)r>@#)cV9N@2r3D!cfDPTIHj~eFjJFiR1VeqHUHx2XuaYY4IBMn)Q za`e6WOFNJ|M>^(+I}iX$CF(Z@X!Y8Rb{Eec45yIbFk53;GnXQLr%Oe zQ*HhO4I5;++MZ8QzU)(R+{<|IG+W6s0`eY)3mRp{ptu5O=PsW8Pv@4H&eQMwAK4ib zqj;{~>E2P6l63m8fKrCSYr8NWjQ_u@Hak8IGm$hdl)?z(p1$AxeZnoqN8$hAa9L%U J3MrG1{|^ISeBuBA diff --git a/src/codechicken/nei/LayoutManager.java b/src/codechicken/nei/LayoutManager.java index e0e834a4..f0210a54 100644 --- a/src/codechicken/nei/LayoutManager.java +++ b/src/codechicken/nei/LayoutManager.java @@ -86,7 +86,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH public static TextField searchField; public static ButtonCycled options; - public static ButtonCycled bookmarks; + public static ButtonCycled bookmarksButton; public static Button more; public static Button less; @@ -203,7 +203,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return true; } if (keyID == getKeyBinding("gui.hide_bookmarks")) { - toggleBooleanSetting("bookmarksEnabled"); + toggleBooleanSetting("inventory.bookmarksEnabled"); return true; } @@ -251,7 +251,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH widget.draw(mousex, mousey); } else { options.draw(mousex, mousey); - bookmarks.draw(mousex, mousey); + bookmarksButton.draw(mousex, mousey); } GL11.glEnable(GL11.GL_LIGHTING); @@ -369,7 +369,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH } }; - bookmarks = new ButtonCycled(2) + bookmarksButton = new ButtonCycled(2) { @Override public boolean onButtonPress(boolean rightclick) { @@ -473,9 +473,9 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH } return false; } - - public String getButtonTip() { - return translate("inventory.gamemode." + getNextGamemode()); + public void addTooltips(List tooltip) { + tooltip.add(translate("inventory.current.gamemode." + getGamemode())); + tooltip.add(EnumChatFormatting.GRAY + translate("inventory.gamemode." + getNextGamemode())); } }; @@ -644,7 +644,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH addWidget(options); - addWidget(bookmarks); + addWidget(bookmarksButton); if (visiblity.showItemPanel) { addWidget(itemPanel); itemPanel.setVisible(); diff --git a/src/codechicken/nei/LayoutStyleMinecraft.java b/src/codechicken/nei/LayoutStyleMinecraft.java index 58b6257c..15b833e0 100644 --- a/src/codechicken/nei/LayoutStyleMinecraft.java +++ b/src/codechicken/nei/LayoutStyleMinecraft.java @@ -6,7 +6,7 @@ import org.lwjgl.opengl.GL11; import static codechicken.lib.gui.GuiDraw.drawStringC; import static codechicken.nei.LayoutManager.bookmarkPanel; -import static codechicken.nei.LayoutManager.bookmarks; +import static codechicken.nei.LayoutManager.bookmarksButton; import static codechicken.nei.LayoutManager.delete; import static codechicken.nei.LayoutManager.dropDown; import static codechicken.nei.LayoutManager.gamemode; @@ -49,8 +49,8 @@ public class LayoutStyleMinecraft extends LayoutStyle timeButtons[2].icon = new Image(144, 24, 12, 12); timeButtons[3].icon = new Image(156, 24, 12, 12); heal.icon = new Image(168, 24, 12, 12); - bookmarks.icons[0] = new Image(0, 36, 16, 16); - bookmarks.icons[1] = new Image(16, 36, 16, 16); + bookmarksButton.icons[0] = new Image(0, 36, 16, 16); + bookmarksButton.icons[1] = new Image(16, 36, 16, 16); options.icons[0] = new Image(32, 36, 16, 16); options.icons[1] = new Image(48, 36, 16, 16); options.icons[2] = new Image(64, 36, 16, 16); @@ -92,7 +92,7 @@ public class LayoutStyleMinecraft extends LayoutStyle else if (NEIClientUtils.isValidGamemode("adventure")) gamemode.index = 2; } - bookmarks.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1; + bookmarksButton.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1; options.index = NEIClientConfig.getCheatMode(); magnet.state = 0x4 | (getMagnetMode() ? 1 : 0); @@ -133,11 +133,11 @@ public class LayoutStyleMinecraft extends LayoutStyle options.y = isEnabled() ? gui.height - 22 : gui.height - 28; options.w = 22; options.h = 22; - - bookmarks.x = 24 + (isEnabled() ? 0 : 6); - bookmarks.y = isEnabled() ? gui.height - 22 : gui.height - 28; - bookmarks.w = 22; - bookmarks.h = 22; + + bookmarksButton.x = 24 + (isEnabled() ? 0 : 6); + bookmarksButton.y = isEnabled() ? gui.height - 22 : gui.height - 28; + bookmarksButton.w = 22; + bookmarksButton.h = 22; searchField.y = gui.height - searchField.h - 2; diff --git a/src/codechicken/nei/NEIClientConfig.java b/src/codechicken/nei/NEIClientConfig.java index e325c715..fc26781e 100644 --- a/src/codechicken/nei/NEIClientConfig.java +++ b/src/codechicken/nei/NEIClientConfig.java @@ -22,6 +22,7 @@ import codechicken.nei.config.OptionList; import codechicken.nei.config.OptionOpenGui; import codechicken.nei.config.OptionTextField; import codechicken.nei.config.OptionToggleButton; +import codechicken.nei.config.OptionToggleButtonBoubs; import codechicken.nei.config.OptionUtilities; import codechicken.nei.recipe.RecipeInfo; import codechicken.obfuscator.ObfuscationRun; @@ -124,8 +125,11 @@ public class NEIClientConfig tag.getTag("command.heal").setDefaultValue(""); API.addOption(new OptionTextField("command.heal")); - tag.getTag("bookmarksEnabled").setComment("Enable/disable bookmarks").getBooleanValue(true); - + tag.getTag("inventory.bookmarksEnabled").setComment("Enable/disable bookmarks").getBooleanValue(true); + API.addOption(new OptionToggleButton("inventory.bookmarksEnabled", true)); + tag.getTag("inventory.jei_style_tabs").setComment("Enable/disable JEI Style Tabs").getBooleanValue(true); + API.addOption(new OptionToggleButtonBoubs("inventory.jei_style_tabs", true)); + setDefaultKeyBindings(); } @@ -285,7 +289,10 @@ public class NEIClientConfig return !enabledOverride || getBooleanSetting("inventory.hidden"); } public static boolean isBookmarkPanelHidden() { - return !getBooleanSetting("bookmarksEnabled"); + return !getBooleanSetting("inventory.bookmarksEnabled"); + } + public static boolean areJEIStyleTabsVisible() { + return getBooleanSetting("inventory.jei_style_tabs"); } public static boolean isEnabled() { return enabledOverride && getBooleanSetting("inventory.widgetsenabled"); diff --git a/src/codechicken/nei/NEIModContainer.java b/src/codechicken/nei/NEIModContainer.java index 1fb8c1dc..044d245d 100644 --- a/src/codechicken/nei/NEIModContainer.java +++ b/src/codechicken/nei/NEIModContainer.java @@ -4,6 +4,7 @@ import codechicken.core.CommonUtils; import codechicken.core.launch.CodeChickenCorePlugin; import codechicken.nei.api.IConfigureNEI; import codechicken.nei.asm.NEICorePlugin; +import codechicken.nei.recipe.GuiRecipeTab; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import cpw.mods.fml.client.FMLFileResourcePack; @@ -14,6 +15,7 @@ import cpw.mods.fml.common.MetadataCollection; import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.VersionParser; import cpw.mods.fml.common.versioning.VersionRange; @@ -91,7 +93,11 @@ public class NEIModContainer extends DummyModContainer ServerHandler.load(); } - + @Subscribe + public void postInit(FMLPostInitializationEvent event) { + if (CommonUtils.isClient()) + GuiRecipeTab.initStackMap(); + } @Override public VersionRange acceptableMinecraftVersionRange() { return VersionParser.parseRange(CodeChickenCorePlugin.mcVersion); diff --git a/src/codechicken/nei/api/ItemInfo.java b/src/codechicken/nei/api/ItemInfo.java index a50079cc..0c91a4fb 100644 --- a/src/codechicken/nei/api/ItemInfo.java +++ b/src/codechicken/nei/api/ItemInfo.java @@ -10,6 +10,7 @@ import codechicken.nei.ItemStackSet; import codechicken.nei.NEIClientConfig; import codechicken.nei.PopupInputHandler; import codechicken.nei.config.ArrayDumper; +import codechicken.nei.config.HandlerDumper; import codechicken.nei.config.ItemPanelDumper; import codechicken.nei.config.RegistryDumper; import codechicken.nei.guihook.GuiContainerManager; @@ -261,6 +262,7 @@ public class ItemInfo } }); API.addOption(new ItemPanelDumper("tools.dump.itempanel")); + API.addOption(new HandlerDumper("tools.dump.handlers")); } private static void parseModItems() { diff --git a/src/codechicken/nei/config/HandlerDumper.java b/src/codechicken/nei/config/HandlerDumper.java new file mode 100644 index 00000000..455b1948 --- /dev/null +++ b/src/codechicken/nei/config/HandlerDumper.java @@ -0,0 +1,110 @@ +package codechicken.nei.config; + +import codechicken.nei.NEIClientConfig; +import codechicken.nei.recipe.GuiRecipeTab; +import codechicken.nei.recipe.GuiUsageRecipe; +import codechicken.nei.recipe.IRecipeHandler; +import codechicken.nei.recipe.TemplateRecipeHandler; +import codechicken.nei.util.NBTJson; +import com.google.common.base.Objects; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.JsonToNBT; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentTranslation; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.tuple.Pair; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.LinkedList; + +public class HandlerDumper extends DataDumper +{ + public HandlerDumper(String name) { + super(name); + } + + @Override + public String[] header() { + return new String[]{"Handler Recipe Name", "Handler Class", "Overlay Identifier", "Mod DisplayName", "ItemStack"}; + } + + @Override + public Iterable dump(int mode) { + LinkedList list = new LinkedList<>(); + for (IRecipeHandler handler : GuiUsageRecipe.usagehandlers) { + final String handlerName = handler.toString().split("@")[0]; + final String handlerId = Objects.firstNonNull(handler instanceof TemplateRecipeHandler ? ((TemplateRecipeHandler)handler).getOverlayIdentifier() : null, "null"); + Pair stackMapEntry = GuiRecipeTab.lookupStackMap(handlerName, handlerId); + + list.add(new String[] { + handler.getRecipeName(), + handlerName, + handlerId, + stackMapEntry != null ? stackMapEntry.getLeft() : "Unknown", + stackMapEntry != null ? stackMapEntry.getRight().toString() : "Unknown" + }); + } + return list; + } + + @Override + public String renderName() { + return translateN(name); + } + + @Override + public String getFileExtension() { + switch(getMode()) { + case 0: return ".csv"; + case 1: return ".json"; + } + return null; + } + + @Override + public ChatComponentTranslation dumpMessage(File file) { + return new ChatComponentTranslation(namespaced(name + ".dumped"), "dumps/" + file.getName()); + } + + @Override + public String modeButtonText() { + return translateN(name + ".mode." + getMode()); + } + + + @Override + public void dumpTo(File file) throws IOException { + if (getMode() == 0) + super.dumpTo(file); + else + dumpJson(file); + } + + public void dumpJson(File file) throws IOException { + final String[] header = header(); + final FileWriter writer; + try { + writer = new FileWriter(file); + for (String[] list : dump(getMode())) { + NBTTagCompound tag = new NBTTagCompound(); + for (int i = 0; i < header.length; i++) { + tag.setString(header[i], list[i]); + } + IOUtils.write(NBTJson.toJson(tag) + "\n", writer); + } + writer.close(); + } catch (IOException e) { + NEIClientConfig.logger.error("Filed to save dump handler list to file {}", file, e); + } + + + } + + @Override + public int modeCount() { + return 2; + } +} diff --git a/src/codechicken/nei/config/OptionToggleButtonBoubs.java b/src/codechicken/nei/config/OptionToggleButtonBoubs.java new file mode 100644 index 00000000..a6421012 --- /dev/null +++ b/src/codechicken/nei/config/OptionToggleButtonBoubs.java @@ -0,0 +1,64 @@ +package codechicken.nei.config; + +import codechicken.lib.render.CCRenderState; +import codechicken.nei.Image; +import codechicken.nei.LayoutManager; +import org.lwjgl.opengl.GL11; + +import java.awt.Rectangle; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawStringC; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +public class OptionToggleButtonBoubs extends OptionButton +{ + public final boolean prefixed; + + public OptionToggleButtonBoubs(String name, boolean prefixed) { + super(name); + this.prefixed = prefixed; + } + + public OptionToggleButtonBoubs(String name) { + this(name, false); + } + + public boolean state() { + return renderTag().getBooleanValue(); + } + + @Override + public void drawButton(int mx, int my) { + Rectangle b = buttonSize(); + LayoutManager.drawButtonBackground(b.x, b.y, b.width, b.height, true, getButtonTex(mx, my)); + if(state()) { + changeTexture("nei:textures/nei_sprites.png"); + GL11.glColor4f(1, 1, 1, 1); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + Image image = new Image(48, 52, 24, 24); +// drawTexturedModalRect(x, y, image.x, image.y, image.width, image.height); + drawTexturedModalRect(b.x + (b.width/2) - (image.width/2), b.y, image.x, image.y, image.width, image.height); + GL11.glDisable(GL11.GL_BLEND); + + }else { + drawStringC(getButtonText(), b.x, b.y, b.width, b.height, getTextColour(mx, my)); + } + } + + public String getButtonText() { + return translateN(name + (state() ? ".true" : ".false")); + } + + @Override + public String getPrefix() { + return prefixed ? translateN(name) : null; + } + + @Override + public boolean onClick(int button) { + getTag().setBooleanValue(!state()); + return true; + } +} diff --git a/src/codechicken/nei/recipe/GuiRecipe.java b/src/codechicken/nei/recipe/GuiRecipe.java index a7635878..0391bb54 100644 --- a/src/codechicken/nei/recipe/GuiRecipe.java +++ b/src/codechicken/nei/recipe/GuiRecipe.java @@ -7,9 +7,12 @@ import codechicken.nei.LayoutManager; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; import codechicken.nei.PositionedStack; +import codechicken.nei.VisiblityData; import codechicken.nei.api.IGuiContainerOverlay; +import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.IOverlayHandler; import codechicken.nei.api.IRecipeOverlayRenderer; +import codechicken.nei.api.TaggedInventoryArea; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerTooltipHandler; import codechicken.nei.guihook.IGuiClientSide; @@ -17,6 +20,8 @@ import codechicken.nei.guihook.IGuiHandleMouseWheel; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import org.lwjgl.input.Keyboard; @@ -25,9 +30,11 @@ import org.lwjgl.opengl.GL11; import java.awt.Point; import java.awt.Rectangle; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; -public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOverlay, IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler +public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOverlay, IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler, INEIGuiHandler { public ArrayList currenthandlers = new ArrayList<>(); @@ -40,9 +47,12 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve public GuiButton prevpage; public GuiButton overlay1; public GuiButton overlay2; + private final Rectangle area = new Rectangle(); + private final GuiRecipeTabs recipeTabs; protected GuiRecipe(GuiScreen prevgui) { super(new ContainerRecipe()); + recipeTabs = new GuiRecipeTabs(this); slotcontainer = (ContainerRecipe) inventorySlots; this.prevGui = prevgui; @@ -51,33 +61,32 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve if (prevgui instanceof IGuiContainerOverlay) this.firstGui = ((IGuiContainerOverlay) prevgui).getFirstScreen(); + } + @Override public void initGui() { super.initGui(); - currenthandlers = getCurrentRecipeHandlers(); + currenthandlers = getCurrentRecipeHandlers(); // Probably don't comment me out GuiButton nexttype = new GuiNEIButton(0, width / 2 - 70, (height - ySize) / 2 + 3, 13, 12, "<"); GuiButton prevtype = new GuiNEIButton(1, width / 2 + 57, (height - ySize) / 2 + 3, 13, 12, ">"); nextpage = new GuiNEIButton(2, width / 2 - 70, (height + ySize) / 2 - 18, 13, 12, "<"); prevpage = new GuiNEIButton(3, width / 2 + 57, (height + ySize) / 2 - 18, 13, 12, ">"); overlay1 = new GuiNEIButton(4, width / 2 + 65, (height - ySize) / 2 + 63, 13, 12, "?"); overlay2 = new GuiNEIButton(5, width / 2 + 65, (height - ySize) / 2 + 128, 13, 12, "?"); - buttonList.add(nexttype); - buttonList.add(prevtype); - buttonList.add(nextpage); - buttonList.add(prevpage); - buttonList.add(overlay1); - buttonList.add(overlay2); + + buttonList.addAll(Arrays.asList(nexttype, prevtype, nextpage, prevpage, overlay1, overlay2)); if (currenthandlers.size() == 1) { nexttype.visible = false; prevtype.visible = false; } + recipeTabs.initLayout(); refreshPage(); } - + @Override public void keyTyped(char c, int i) { if (i == Keyboard.KEY_ESCAPE) //esc @@ -109,13 +118,14 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int x, int y, int button) { IRecipeHandler recipehandler = currenthandlers.get(recipetype); for (int recipe = page * recipehandler.recipiesPerPage(); recipe < recipehandler.numRecipes() && recipe < (page + 1) * recipehandler.recipiesPerPage(); recipe++) - if (recipehandler.mouseClicked(this, par3, recipe)) + if (recipehandler.mouseClicked(this, button, recipe)) return; - - super.mouseClicked(par1, par2, par3); + if (recipeTabs.mouseClicked(x, y, button)) + return; + super.mouseClicked(x, y, button); } @Override @@ -155,7 +165,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve IRecipeHandler recipehandler = currenthandlers.get(recipetype); for (int i = page * recipehandler.recipiesPerPage(); i < recipehandler.numRecipes() && i < (page + 1) * recipehandler.recipiesPerPage(); i++) currenttip = recipehandler.handleTooltip(this, currenttip, i); - + recipeTabs.handleTooltip(mousex, mousey, currenttip); return currenttip; } @@ -190,6 +200,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve if (recipetype >= currenthandlers.size()) recipetype = 0; page = 0; + recipeTabs.calcPageNumber(); } private void prevType() { @@ -197,6 +208,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve if (recipetype < 0) recipetype = currenthandlers.size() - 1; page = 0; + recipeTabs.calcPageNumber(); } private void overlayRecipe(int recipe) { @@ -215,8 +227,19 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve public void refreshPage() { refreshSlots(); - IRecipeHandler handler = currenthandlers.get(recipetype); + area.width = xSize; + area.height = ySize; + area.x = guiLeft - 2; + area.y = guiTop - 4; + + final boolean avarita = handler.getClass().toString().contains("fox.spiteful.avaritia.compat.nei."); + if (avarita) { + area.width = 256; + area.height = 208; + } + + boolean multiplepages = handler.numRecipes() > handler.recipiesPerPage(); nextpage.visible = multiplepages; prevpage.visible = multiplepages; @@ -229,6 +252,8 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve } else { overlay1.visible = overlay2.visible = false; } + + recipeTabs.refreshPage(); } private void refreshSlots() { @@ -252,7 +277,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { GuiContainerManager.enable2DRender(); IRecipeHandler recipehandler = currenthandlers.get(recipetype); @@ -271,13 +296,20 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve } @Override - protected void drawGuiContainerBackgroundLayer(float f, int mx, int my) { + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { GL11.glColor4f(1, 1, 1, 1); CCRenderState.changeTexture("nei:textures/gui/recipebg.png"); - int j = (width - xSize) / 2; + int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); + if (NEIClientConfig.areJEIStyleTabsVisible()) { + RenderHelper.enableGUIStandardItemLighting(); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f); + recipeTabs.draw(mouseX, mouseY); + RenderHelper.disableStandardItemLighting(); + } + GL11.glPushMatrix(); GL11.glTranslatef(j + 5, k + 16, 0); IRecipeHandler recipehandler = currenthandlers.get(recipetype); @@ -308,12 +340,41 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve @Override public void mouseScrolled(int i) { if (new Rectangle(guiLeft, guiTop, xSize, ySize).contains(GuiDraw.getMousePosition())) { - if (i > 0) - prevPage(); - else - nextPage(); + if (i > 0) prevPage(); + else nextPage(); } } public abstract ArrayList getCurrentRecipeHandlers(); + + @Override + public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) + { + return currentVisibility; + } + + @Override + public Iterable getItemSpawnSlots(GuiContainer gui, ItemStack item) { + return Collections.emptyList(); + } + + + @Override + public List getInventoryAreas(GuiContainer gui) { + return null; + } + + @Override + public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) { + return false; + } + + @Override + public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) { + // Because some of the handlers *cough avaritia* are oversized + Rectangle rect = new Rectangle(area); + + return rect.contains(x, y, w, h); + } + } diff --git a/src/codechicken/nei/recipe/GuiRecipeTab.java b/src/codechicken/nei/recipe/GuiRecipeTab.java new file mode 100644 index 00000000..fa3a47cc --- /dev/null +++ b/src/codechicken/nei/recipe/GuiRecipeTab.java @@ -0,0 +1,563 @@ +package codechicken.nei.recipe; + + +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.Button; +import codechicken.nei.Image; +import codechicken.nei.LayoutManager; +import codechicken.nei.guihook.GuiContainerManager; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.opengl.GL11; + +import java.util.HashMap; +import java.util.List; + +public class GuiRecipeTab extends Button { + public static HashMap> iconMap = new HashMap<>(); + public static HashMap> stackMap = new HashMap<>(); + + public static final int TAB_WIDTH = 24; + public static final int TAB_HEIGHT = 24; + private static final Image selectedIcon = new Image(0, 52, 24, 24); + private static final Image unselectedIcon = new Image(24, 52, 24, 24); + + private final GuiRecipe guiRecipe; + private final IRecipeHandler handler; + private final String handlerName; + private final String handlerID; + + public GuiRecipeTab(GuiRecipe guiRecipe, IRecipeHandler handler, int x, int y) { + super(); + this.x = x; + this.y = y; + this.w = TAB_WIDTH; + this.h = TAB_HEIGHT; + this.handler = handler; + this.handlerName = handler.toString().split("@")[0]; + this.guiRecipe = guiRecipe; + + if(handler instanceof TemplateRecipeHandler) { + handlerID = (((TemplateRecipeHandler)handler).getOverlayIdentifier()); + } else { + handlerID = null; + } + } + + public void draw(boolean selected, int mouseX, int mouseY) { + drawTab(selected, mouseX, mouseY); + drawTabIcon(selected, mouseX, mouseY); + } + + public void drawTab(boolean selected, int mouseX, int mouseY) { + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glColor4f(1, 1, 1, 1); + + if (selected) icon = selectedIcon; + else icon = unselectedIcon; + + final int iconX = x + (w - icon.width) / 2; + final int iconY = y + (h - icon.height) / 2; + LayoutManager.drawIcon(iconX, iconY, icon); + + } + + public void drawTabIcon(boolean selected, int mouseX, int mouseY) { + final int iconX = x + 4; + final int iconY = y + 4; + + final FontRenderer fontRenderer = GuiDraw.fontRenderer; + final Image icon = getIcon(handlerName); + + final ItemStack itemStack = getItemStack(handlerName, handlerID); + + + if (icon != null) { + LayoutManager.drawIcon(iconX + 1, iconY + 1, icon); + } else if (itemStack != null) { + GuiContainerManager.drawItems.zLevel += 100; + GuiContainerManager.drawItem(iconX, iconY, itemStack); + GuiContainerManager.drawItems.zLevel -= 100; + } else { + // Text fallback + String text = handler.getRecipeName().substring(0, 2); + int textCenterX = x + (int) (TAB_WIDTH / 2f); + int textCenterY = y + (int) (TAB_HEIGHT / 2f) - 3; + int color = selected ? 16777120 : 14737632; + fontRenderer.drawStringWithShadow(text, textCenterX - (int) (fontRenderer.getStringWidth(text) / 2f), textCenterY, color); + GL11.glColor4f(1, 1, 1, 1); + } + } + + @Override + public void addTooltips(List tooltip) { + tooltip.add(handler.getRecipeName().trim()); + + String handlerMod = getHandlerMod(handlerName, handlerID); + tooltip.add(EnumChatFormatting.BLUE + handlerMod); + + if (handlerMod.equals("Unknown")) { + tooltip.add(""); + tooltip.add("HandlerName: " + handlerName); + tooltip.add("HandlerID: " + handlerID); + } + + } + + @Override + public boolean onButtonPress(boolean rightclick) { + int newIdx = guiRecipe.currenthandlers.indexOf(handler); + if (newIdx == -1) + return false; + + guiRecipe.recipetype = newIdx; + return true; + } + + public boolean isSelected(IRecipeHandler current) { + return handler == current; + } + + public static Pair lookupStackMap(String name, String name2) { + Pair res = stackMap.get(name); + if (res == null) res = stackMap.get(name2); + + return res; + } + + + public static String getHandlerMod(String name, String name2) { + Pair stackRes = lookupStackMap(name, name2); + if (stackRes != null) + return stackRes.getLeft(); + + Pair iconRes = iconMap.get(name); + if (iconRes != null) + return iconRes.getLeft(); + + return "Unknown"; + } + + private ItemStack getItemStack(String handlerName, String handlerID) { + Pair lookup = lookupStackMap(handlerName, handlerID); + if (lookup != null) + return lookup.getRight(); + return null; + } + + public static Image getIcon(String id) { + Pair res = iconMap.get(id); + if (res != null) + return res.getRight(); + return null; + } + + public static void initStackMap() { + System.out.println("InitStackMap() --------"); + // Vanilla + addToStackMap("codechicken.nei.recipe.BrewingRecipeHandler", "minecraft", "minecraft:brewing_stand"); + addToStackMap("codechicken.nei.recipe.FireworkRecipeHandler", "minecraft", "minecraft:fireworks"); + addToStackMap("codechicken.nei.recipe.FurnaceRecipeHandler", "minecraft", "minecraft:furnace"); + addToStackMap("codechicken.nei.recipe.ShapedRecipeHandler", "minecraft", "minecraft:crafting_table"); + addToStackMap("codechicken.nei.recipe.ShapelessRecipeHandler", "minecraft", "minecraft:crafting_table"); + addToIconMap("codechicken.nei.recipe.FuelRecipeHandler", "minecraft", new Image(80, 36, 14, 14)); + + // IC2 + if (Loader.isModLoaded("IC2")) { + addToStackMap("ic2.neiIntegration.core.recipehandler.AdvRecipeHandler", "IC2", "IC2:blockreactorvessel"); + addToStackMap("ic2.neiIntegration.core.recipehandler.AdvShapelessRecipeHandler", "IC2", "IC2:blockreactorvessel"); + addToStackMap("ic2.neiIntegration.core.recipehandler.BlastFurnaceRecipeHandler", "IC2", "IC2:blockMachine3:1"); + addToStackMap("ic2.neiIntegration.core.recipehandler.BlockCutterRecipeHandler", "IC2", "IC2:blockMachine3:2"); + addToStackMap("ic2.neiIntegration.core.recipehandler.CentrifugeRecipeHandler", "IC2", "IC2:blockMachine2:3"); + addToStackMap("ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler", "IC2", "IC2:blockMachine:5"); + addToStackMap("ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler", "IC2", "IC2:blockMachine:4"); + addToStackMap("ic2.neiIntegration.core.recipehandler.FluidCannerRecipeHandler", "IC2", "IC2:blockMachine:6"); + addToStackMap("ic2.neiIntegration.core.recipehandler.LatheRecipeHandler", "IC2", "IC2:blockMachine3:8"); + addToStackMap("ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler", "IC2", "IC2:blockMachine:3"); + addToStackMap("ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerCutting", "IC2", "IC2:blockMachine2:4"); + addToStackMap("ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerExtruding", "IC2", "IC2:blockMachine2:4"); + addToStackMap("ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerRolling", "IC2", "IC2:blockMachine2:4"); + addToStackMap("ic2.neiIntegration.core.recipehandler.OreWashingRecipeHandler", "IC2", "IC2:blockMachine2:5"); + addToStackMap("ic2.neiIntegration.core.recipehandler.ScrapboxRecipeHandler", "IC2", "IC2:itemScrapbox"); + addToStackMap("ic2.neiIntegration.core.recipehandler.SolidCannerRecipeHandler", "IC2", "IC2:blockMachine2:9"); + } + + // Gregtech 5u + if (!Loader.isModLoaded("gregapi_post") && Loader.isModLoaded("gregtech")) { + addToStackMap("gt.recipe.alloyblastsmelter", "gregtech", "gregtech:gt.blockmachines:810"); // gt.blockmachines.industrialsalloyamelter.controller.tier.single + addToStackMap("gt.recipe.alloysmelter", "gregtech", "gregtech:gt.blockmachines:201"); // gt.blockmachines.basicmachine.alloysmelter.tier.01 + addToStackMap("gt.recipe.arcfurnace", "gregtech", "gregtech:gt.blockmachines:651"); // gt.blockmachines.basicmachine.arcfurnace.tier.01 + addToStackMap("gt.recipe.assembler", "gregtech", "gregtech:gt.blockmachines:211"); // gt.blockmachines.basicmachine.assembler.tier.01 + addToStackMap("gt.recipe.autoclave", "gregtech", "gregtech:gt.blockmachines:571"); // gt.blockmachines.basicmachine.autoclave.tier.01 + addToStackMap("gt.recipe.blastfurnace", "gregtech", "gregtech:gt.blockmachines:1000"); // gt.blockmachines.multimachine.blastfurnace + addToStackMap("gt.recipe.brewer", "gregtech", "gregtech:gt.blockmachines:491"); // gt.blockmachines.basicmachine.brewery.tier.01 + addToStackMap("gt.recipe.canner", "gregtech", "gregtech:gt.blockmachines:231"); // gt.blockmachines.basicmachine.canner.tier.01 + addToStackMap("gt.recipe.centrifuge", "gregtech", "gregtech:gt.blockmachines:361"); // gt.blockmachines.basicmachine.centrifuge.tier.01 + addToStackMap("gt.recipe.chemicalbath", "gregtech", "gregtech:gt.blockmachines:541"); // gt.blockmachines.basicmachine.chemicalbath.tier.01 + addToStackMap("gt.recipe.chemicaldehydrator", "gregtech", "gregtech:gt.blockmachines:912"); // gt.blockmachines.machine.dehydrator.tier.01 + addToStackMap("gt.recipe.chemicalreactor", "gregtech", "gregtech:gt.blockmachines:421"); // gt.blockmachines.basicmachine.chemicalreactor.tier.01 + addToStackMap("gt.recipe.circuitassembler", "gregtech", "gregtech:gt.blockmachines:1180"); // gt.blockmachines.basicmachine.circuitassembler.tier.01 + addToStackMap("gt.recipe.cokeoven", "gregtech", "gregtech:gt.blockmachines:791"); // gt.blockmachines.industrialcokeoven.controller.tier.single + addToStackMap("gt.recipe.compressor", "gregtech", "gregtech:gt.blockmachines:241"); // gt.blockmachines.basicmachine.compressor.tier.01 + addToStackMap("gt.recipe.craker", "gregtech", "gregtech:gt.blockmachines:1160"); // gt.blockmachines.multimachine.cracker + addToStackMap("gt.recipe.cuttingsaw", "gregtech", "gregtech:gt.blockmachines:251"); // gt.blockmachines.basicmachine.cutter.tier.01 + addToStackMap("gt.recipe.cyclotron", "gregtech", "gregtech:gt.blockmachines:828"); // gt.blockmachines.cyclotron.tier.single + addToStackMap("gt.recipe.dieselgeneratorfuel", "gregtech", "gregtech:gt.blockmachines:793"); // gt.blockmachines.advancedgenerator.rocketfuel.tier.01 + addToStackMap("gt.recipe.distillationtower", "gregtech", "gregtech:gt.blockmachines:1126"); // gt.blockmachines.multimachine.distillationtower + addToStackMap("gt.recipe.distillery", "gregtech", "gregtech:gt.blockmachines:531"); // gt.blockmachines.basicmachine.distillery.tier.01 + addToStackMap("gt.recipe.electricimplosioncompressor", "gregtech", "gregtech:gt.blockmachines:12734"); // gt.blockmachines.electricimplosioncompressor + addToStackMap("gt.recipe.electrolyzer", "gregtech", "gregtech:gt.blockmachines:371"); // gt.blockmachines.basicmachine.electrolyzer.tier.01 + addToStackMap("gt.recipe.electromagneticseparator", "gregtech", "gregtech:gt.blockmachines:561"); // gt.blockmachines.basicmachine.electromagneticseparator.tier.01 + addToStackMap("gt.recipe.extractor", "gregtech", "gregtech:gt.blockmachines:271"); // gt.blockmachines.basicmachine.extractor.tier.01 + addToStackMap("gt.recipe.extruder", "gregtech", "gregtech:gt.blockmachines:281"); // gt.blockmachines.basicmachine.extruder.tier.01 + addToStackMap("gt.recipe.fakeAssemblylineProcess", "gregtech", "gregtech:gt.blockmachines:1170"); // gt.blockmachines.multimachine.assemblyline + addToStackMap("gt.recipe.fermenter", "gregtech", "gregtech:gt.blockmachines:501"); // gt.blockmachines.basicmachine.fermenter.tier.01 + addToStackMap("gt.recipe.fishpond", "gregtech", "gregtech:gt.blockmachines:829"); // gt.blockmachines.industrial.fishpond.controller.tier.single + addToStackMap("gt.recipe.fluidcanner", "gregtech", "gregtech:gt.blockmachines:431"); // gt.blockmachines.basicmachine.fluidcanner.tier.01 + addToStackMap("gt.recipe.fluidextractor", "gregtech", "gregtech:gt.blockmachines:511"); // gt.blockmachines.basicmachine.fluidextractor.tier.01 + addToStackMap("gt.recipe.fluidheater", "gregtech", "gregtech:gt.blockmachines:621"); // gt.blockmachines.basicmachine.fluidheater.tier.01 + addToStackMap("gt.recipe.fluidsolidifier", "gregtech", "gregtech:gt.blockmachines:521"); // gt.blockmachines.basicmachine.fluidsolidifier.tier.01 + addToStackMap("gt.recipe.fusionreactor", "gregtech", "gregtech:gt.blockmachines:1193"); // gt.blockmachines.fusioncomputer.tier.06 + addToStackMap("gt.recipe.gasturbinefuel", "gregtech", "gregtech:gt.blockmachines:961"); // gt.blockmachines.basicgenerator.gas.tier.00 + addToStackMap("gt.recipe.geothermalfuel", "gregtech", "gregtech:gt.blockmachines:830"); // gt.blockmachines.advancedgenerator.geothermalfuel.tier.01 + addToStackMap("gt.recipe.hammer", "gregtech", "gregtech:gt.blockmachines:611"); // gt.blockmachines.basicmachine.hammer.tier.01 + addToStackMap("gt.recipe.implosioncompressor", "gregtech", "gregtech:gt.blockmachines:12734"); // gt.blockmachines.electricimplosioncompressor + addToStackMap("gt.recipe.largeboilerfakefuels", "gregtech", "gregtech:gt.blockmachines:1020"); // gt.blockmachines.multimachine.boiler.bronze + addToStackMap("gt.recipe.largechemicalreactor", "gregtech", "gregtech:gt.blockmachines:1169"); // gt.blockmachines.multimachine.chemicalreactor + addToStackMap("gt.recipe.laserengraver", "gregtech", "gregtech:gt.blockmachines:591"); // gt.blockmachines.basicmachine.laserengraver.tier.01 + addToStackMap("gt.recipe.lathe", "gregtech", "gregtech:gt.blockmachines:291"); // gt.blockmachines.basicmachine.lathe.tier.01 + addToStackMap("gt.recipe.macerator", "gregtech", "gregtech:gt.blockmachines:301"); // gt.blockmachines.basicmachine.macerator.tier.01 + addToStackMap("gt.recipe.magicfuels", "gregtech", "gregtech:gt.blockmachines:1123"); // gt.blockmachines.basicgenerator.magicenergyconverter.tier.01 + addToStackMap("gt.recipe.massfab", "gregtech", "gregtech:gt.blockmachines:461"); // gt.blockmachines.basicmachine.massfab.tier.01 + addToStackMap("gt.recipe.metalbender", "gregtech", "gregtech:gt.blockmachines:221"); // gt.blockmachines.basicmachine.bender.tier.01 + addToStackMap("gt.recipe.microwave", "gregtech", "gregtech:gt.blockmachines:311"); // gt.blockmachines.basicmachine.microwave.tier.01 + addToStackMap("gt.recipe.mixer", "gregtech", "gregtech:gt.blockmachines:581"); // gt.blockmachines.basicmachine.mixer.tier.01 + addToStackMap("gt.recipe.orewasher", "gregtech", "gregtech:gt.blockmachines:391"); // gt.blockmachines.basicmachine.orewasher.tier.01 + addToStackMap("gt.recipe.packager", "gregtech", "gregtech:gt.blockmachines:401"); // gt.blockmachines.basicmachine.boxinator.tier.01 + addToStackMap("gt.recipe.plasmaarcfurnace", "gregtech", "gregtech:gt.blockmachines:661"); // gt.blockmachines.basicmachine.plasmaarcfurnace.tier.01 + addToStackMap("gt.recipe.plasmageneratorfuels", "gregtech", "gregtech:gt.blockmachines:1196"); // gt.blockmachines.basicgenerator.plasmagenerator.tier.05 + addToStackMap("gt.recipe.polarizer", "gregtech", "gregtech:gt.blockmachines:551"); // gt.blockmachines.basicmachine.polarizer.tier.01 + addToStackMap("gt.recipe.press", "gregtech", "gregtech:gt.blockmachines:601"); // gt.blockmachines.basicmachine.press.tier.01 + addToStackMap("gt.recipe.primitiveblastfurnace", "gregtech", "gregtech:gt.blockmachines:140"); // gt.blockmachines.multimachine.brickedblastfurnace + addToStackMap("gt.recipe.printer", "gregtech", "gregtech:gt.blockmachines:321"); // gt.blockmachines.basicmachine.printer.tier.01 + addToStackMap("gt.recipe.pyro", "gregtech", "gregtech:gt.blockmachines:1159"); // gt.blockmachines.multimachine.pyro + addToStackMap("gt.recipe.replicator", "gregtech", "gregtech:gt.blockmachines:481"); // gt.blockmachines.basicmachine.replicator.tier.01 + addToStackMap("gt.recipe.rockbreaker", "gregtech", "gregtech:gt.blockmachines:441"); // gt.blockmachines.basicmachine.rockbreaker.tier.01 + addToStackMap("gt.recipe.scanner", "gregtech", "gregtech:gt.blockmachines:341"); // gt.blockmachines.basicmachine.scanner.tier.01 + addToStackMap("gt.recipe.semifluidboilerfuels", "gregtech", "gregtech:gt.blockmachines:837"); // gt.blockmachines.basicgenerator.semifluid.tier.01 + addToStackMap("gt.recipe.semifluidgeneratorfuels", "gregtech", "gregtech:gt.blockmachines:837"); // gt.blockmachines.basicgenerator.semifluid.tier.01 + addToStackMap("gt.recipe.sifter", "gregtech", "gregtech:gt.blockmachines:641"); // gt.blockmachines.basicmachine.sifter.tier.01 + addToStackMap("gt.recipe.slicer", "gregtech", "gregtech:gt.blockmachines:631"); // gt.blockmachines.basicmachine.slicer.tier.01 + addToStackMap("gt.recipe.slowfusionreactor", "gregtech", "gregtech:gt.blockmachines:31015"); // gt.blockmachines.gtplusplus.fusion.single + addToStackMap("gt.recipe.smallnaquadahreactor", "gregtech", "gregtech:gt.blockmachines:1188"); // gt.blockmachines.basicgenerator.naquadah.tier.07 + addToStackMap("gt.recipe.thermalcentrifuge", "gregtech", "gregtech:gt.blockmachines:381"); // gt.blockmachines.basicmachine.thermalcentrifuge.tier.01 + addToStackMap("gt.recipe.thermalgeneratorfuel", "gregtech", "gregtech:gt.blockmachines:830"); // gt.blockmachines.advancedgenerator.geothermalfuel.tier.01 + addToStackMap("gt.recipe.unpackager", "gregtech", "gregtech:gt.blockmachines:411"); // gt.blockmachines.basicmachine.unboxinator.tier.01 + addToStackMap("gt.recipe.vacuumfreezer", "gregtech", "gregtech:gt.blockmachines:1002"); // gt.blockmachines.multimachine.vacuumfreezer + addToStackMap("gt.recipe.wiremill", "gregtech", "gregtech:gt.blockmachines:351"); // gt.blockmachines.basicmachine.wiremill.tier.01 + addToStackMap("ic.recipe.recycler", "gregtech", "gregtech:gt.blockmachines:331"); // gt.blockmachines.basicmachine.recycler.tier.01 + +// // Maybe acid generator +// //tabItemIcon.put("null", stackDB("gt.blockmachines.acidgeneratormv")); +// +// // Maybe not release +// tabItemIcon.put("gt.recipe.largenaquadahreactor", stackDB("gt.blockmachines.1nr.controller.single")); +// tabItemIcon.put("gt.recipe.fluidnaquadahreactor", stackDB("gt.blockmachines.1nr.controller.single")); +// tabItemIcon.put("gt.recipe.hugenaquadahreactor", stackDB("gt.blockmachines.1nr.controller.single")); +// tabItemIcon.put("gt.recipe.extrahugenaquadahreactor", stackDB("gt.blockmachines.1nr.controller.single")); + + } + + if (Loader.isModLoaded("appliedenergistics2")) { + + addToStackMap("appeng.integration.modules.NEIHelpers.NEIAEShapedRecipeHandler", "AppliedEnergistics2","appliedenergistics2:item.ItemMultiPart:380"); + addToStackMap("appeng.integration.modules.NEIHelpers.NEIAEShapelessRecipeHandler","AppliedEnergistics2", "appliedenergistics2:item.ItemMultiPart:380"); + addToStackMap("appeng.integration.modules.NEIHelpers.NEIFacadeRecipeHandler", "AppliedEnergistics2", "appliedenergistics2:item.ItemFacade:192"); + addToStackMap("appeng.integration.modules.NEIHelpers.NEIInscriberRecipeHandler", "AppliedEnergistics2", "appliedenergistics2:tile.BlockInscriber"); + addToStackMap("appeng.integration.modules.NEIHelpers.NEIWorldCraftingHandler", "AppliedEnergistics2", "appliedenergistics2:item.ItemMultiMaterial:9"); + + } + + if (Loader.isModLoaded("AdvancedSolarPanel")) { + addToStackMap("advsolar.client.nei.MTRecipeHandler", "AdvancedSolarPanel", "AdvancedSolarPanel:BlockMolecularTransformer"); + } + + if (Loader.isModLoaded("WitcheryExtras")) { + addToStackMap("alkalus.main.nei.NEI_Handler_Cauldron", "witchery", "witchery:cauldron"); + addToStackMap("alkalus.main.nei.NEI_Handler_Distillery", "witchery", "witchery:distilleryidle"); + addToStackMap("alkalus.main.nei.NEI_Handler_Kettle", "witchery", "witchery:kettle"); + addToStackMap("alkalus.main.nei.NEI_Handler_Oven", "witchery", "witchery:witchesovenidle"); + addToStackMap("alkalus.main.nei.NEI_Handler_SpinningWheel", "witchery", "witchery:spinningwheel"); + } + + if (Loader.isModLoaded("BuildCraft|Silicon")) { + addToStackMap("buildcraft.compat.nei.RecipeHandlerAssemblyTable", "BuildCraft", "BuildCraft|Silicon:laserTableBlock"); + addToStackMap("buildcraft.compat.nei.RecipeHandlerIntegrationTable", "BuildCraft", "BuildCraft|Silicon:laserTableBlock:2"); + } + if (Loader.isModLoaded("BuildCraft|Factory")) { + addToStackMap("buildcraft.compat.nei.RecipeHandlerRefinery", "BuildCraft", "BuildCraft|Factory:refineryBlock"); + } + + if (Loader.isModLoaded("Thaumcraft")) { + addToStackMap("com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.ArcaneShapelessRecipeHandler", "Thaumcraft", "Thaumcraft:blockTable:15"); + addToStackMap("com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.CrucibleRecipeHandler", "Thaumcraft", "Thaumcraft:blockMetalDevice"); + addToStackMap("com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.InfusionRecipeHandler", "Thaumcraft", "Thaumcraft:blockStoneDevice:2"); + } + + if (Loader.isModLoaded("bartworks")) { + addToStackMap("com.github.bartimaeusnek.bartworks.neiHandler.BW_NEI_BioLabHandler", "BartWorks", "gregtech:gt.blockmachines:12699"); + addToStackMap("com.github.bartimaeusnek.bartworks.neiHandler.BW_NEI_BioVatHandler", "BartWorks", "gregtech:gt.blockmachines:12712"); + addToStackMap("com.github.bartimaeusnek.bartworks.neiHandler.BW_NEI_OreHandler", "BartWorks", "bartworks:bw.blockores.01:89"); + } + if (Loader.isModLoaded("tectech")) { + addToStackMap("com.github.technus.tectech.nei.TT_NEI_ResearchHandler", "TecTech", "gregtech:gt.blockmachines:15331"); + addToStackMap("com.github.technus.tectech.nei.TT_NEI_ScannerHandler", "TecTech", "tectech:item.em.definitionScanStorage"); + } + if (Loader.isModLoaded("ExtraUtilities")) { + addToStackMap("com.rwtema.extrautils.nei.EnderConstructorHandler", "ExtraUtilities", "ExtraUtilities:endConstructor"); + addToStackMap("com.rwtema.extrautils.nei.FMPMicroBlocksHandler", "ExtraUtilities", "ForgeMicroblock:sawIron"); + addToStackMap("com.rwtema.extrautils.nei.InfoHandler", "ExtraUtilities", "ExtraUtilities:chandelier"); + addToStackMap("com.rwtema.extrautils.nei.MicroBlocksHandler", "ExtraUtilities", "ExtraUtilities:microblocks:1"); + addToStackMap("com.rwtema.extrautils.nei.SoulHandler", "ExtraUtilities", "ExtraUtilities:mini-soul"); + } + if (Loader.isModLoaded("EnderIO")) { + addToStackMap("crazypants.enderio.nei.AlloySmelterRecipeHandler", "EnderIO", "EnderIO:blockAlloySmelter"); + addToStackMap("crazypants.enderio.nei.EnchanterRecipeHandler", "EnderIO", "EnderIO:blockEnchanter"); + addToStackMap("crazypants.enderio.nei.SagMillRecipeHandler", "EnderIO", "EnderIO:blockSagMill"); + addToStackMap("crazypants.enderio.nei.SliceAndSpliceRecipeHandler", "EnderIO", "EnderIO:blockSliceAndSplice"); + addToStackMap("crazypants.enderio.nei.SoulBinderRecipeHandler", "EnderIO", "EnderIO:blockSoulBinder"); + addToStackMap("crazypants.enderio.nei.VatRecipeHandler", "EnderIO", "EnderIO:blockVat"); + } + + if (Loader.isModLoaded("extracells")) { + addToStackMap("extracells.integration.nei.UniversalTerminalRecipe", "ExtraCells", "extracells:part.base:9"); + } + + if (Loader.isModLoaded("Forestry")) { + addToStackMap("forestry.factory.recipes.nei.NEIHandlerBottler", "Forestry", "Forestry:factory"); + addToStackMap("forestry.factory.recipes.nei.NEIHandlerCarpenter", "Forestry", "Forestry:factory:1"); + addToStackMap("forestry.factory.recipes.nei.NEIHandlerCentrifuge", "Forestry", "Forestry:factory:2"); + addToStackMap("forestry.factory.recipes.nei.NEIHandlerFabricator", "Forestry", "Forestry:factory2"); + addToStackMap("forestry.factory.recipes.nei.NEIHandlerFermenter", "Forestry", "Forestry:factory:3"); + addToStackMap("forestry.factory.recipes.nei.NEIHandlerMoistener", "Forestry", "Forestry:factory:4"); + addToStackMap("forestry.factory.recipes.nei.NEIHandlerSqueezer", "Forestry", "Forestry:factory:5"); + addToStackMap("forestry.factory.recipes.nei.NEIHandlerStill", "Forestry", "Forestry:factory:6"); + } + if (Loader.isModLoaded("Avaritia")) { + addToStackMap("fox.spiteful.avaritia.compat.nei.CompressionHandler", "Avaritia", "Avaritia:Neutronium_Compressor"); + addToStackMap("fox.spiteful.avaritia.compat.nei.ExtremeShapedRecipeHandler", "Avaritia", "Avaritia:Dire_Crafting"); + addToStackMap("fox.spiteful.avaritia.compat.nei.ExtremeShapelessRecipeHandler", "Avaritia", "Avaritia:Dire_Crafting"); + } + + + if (Loader.isModLoaded("GalacticraftCore")) { + addToStackMap("galaxyspace.core.nei.rocket.RocketT1RecipeHandler", "Galacticraft", "GalacticraftCore:item.spaceship"); + } + if (Loader.isModLoaded("GalacticraftMars")) { + addToStackMap("galaxyspace.core.nei.rocket.RocketT2RecipeHandler", "Galacticraft", "GalacticraftMars:item.spaceshipTier2:1"); + addToStackMap("galaxyspace.core.nei.rocket.RocketT3RecipeHandler", "Galacticraft", "GalacticraftMars:item.itemTier3Rocket"); + } + if (Loader.isModLoaded("GalaxySpace")) { + addToStackMap("galaxyspace.core.nei.AssemblyMachineRecipeHandler", "GalaxySpace", "GalaxySpace:assemblymachine"); + addToStackMap("galaxyspace.core.nei.rocket.RocketT4RecipeHandler", "GalaxySpace", "GalaxySpace:item.Tier4Rocket"); + addToStackMap("galaxyspace.core.nei.rocket.RocketT5RecipeHandler", "GalaxySpace", "GalaxySpace:item.Tier5Rocket"); + addToStackMap("galaxyspace.core.nei.rocket.RocketT6RecipeHandler", "GalaxySpace", "GalaxySpace:item.Tier6Rocket"); + addToStackMap("galaxyspace.core.nei.rocket.RocketT7RecipeHandler", "GalaxySpace", "GalaxySpace:item.Tier7Rocket"); + addToStackMap("galaxyspace.core.nei.rocket.RocketT8RecipeHandler", "GalaxySpace", "GalaxySpace:item.Tier8Rocket"); + } + if (Loader.isModLoaded("ProjectBlue")) { + addToStackMap("gcewing.projectblue.nei.NEIRecipeHandler", "ProjectBlue", "ProjectBlue:sprayCan"); + } + + if (Loader.isModLoaded("miscutils")) { + addToStackMap("gtPlusPlus.nei.DecayableRecipeHandler", "GT++", "miscutils:dustRadium226"); + addToStackMap("gtPlusPlus.nei.GT_NEI_FlotationCell", "GT++", "gregtech:gt.blockmachines:31028"); + addToStackMap("gtPlusPlus.nei.GT_NEI_FluidReactor", "GT++", "gregtech:gt.blockmachines:998"); + addToStackMap("gtPlusPlus.nei.GT_NEI_MillingMachine", "GT++", "gregtech:gt.blockmachines:31027"); + addToStackMap("gt.recipe.cryogenicfreezer", "GT++", "gregtech:gt.blockmachines:910"); + addToStackMap("gt.recipe.multicentrifuge", "GT++", "gregtech:gt.blockmachines:790"); + addToStackMap("gt.recipe.multielectro", "GT++", "gregtech:gt.blockmachines:796"); + + addToStackMap("gt.recipe.fissionfuel", "GT++", "gregtech:gt.blockmachines:835"); + addToStackMap("gt.recipe.vacfurnace", "GT++", "gregtech:gt.blockmachines:995"); + addToStackMap("gt.recipe.lftr", "GT++", "gregtech:gt.blockmachines:751"); + addToStackMap("gt.recipe.advanced.mixer", "GT++", "gregtech:gt.blockmachines:811"); + addToStackMap("gt.recipe.lftr.2", "GT++", "gregtech:gt.blockmachines:751"); + addToStackMap("gt.recipe.alloyblastsmelter", "GT++", "gregtech:gt.blockmachines:810"); + + addToStackMap("gt.recipe.geothermalfuel", "GT++", "gregtech:gt.blockmachines:830"); + + addToStackMap("gt.recipe.cyclotron", "GT++", "gregtech:gt.blockmachines:828"); + addToStackMap("gt.recipe.simplewasher", "GT++", "gregtech:gt.blockmachines:767"); + addToStackMap("gt.recipe.matterfab2", "GT++", "gregtech:gt.blockmachines:799"); + addToStackMap("gt.recipe.chemicaldehydrator", "GT++", "gregtech:gt.blockmachines:813"); + addToStackMap("gt.recipe.slowfusionreactor", "GT++", "gregtech:gt.blockmachines:31015"); + addToStackMap("gt.recipe.fishpond", "GT++", "gregtech:gt.blockmachines:829"); + addToStackMap("gt.recipe.geothermalfuel", "GT++", "gregtech:gt.blockmachines:830"); + addToStackMap("gt.recipe.cokeoven", "GT++", "gregtech:gt.blockmachines:791"); + } + if (Loader.isModLoaded("Forestry")) { + addToStackMap("hellfirepvp.beebetteratbees.client.gui.BBABGuiRecipeTreeHandler", "Bees", "Forestry:beeQueenGE"); + } + + if (Loader.isModLoaded("RandomThings")) { + addToStackMap("lumien.randomthings.Handler.ModCompability.NEI.ImbuingStationRecipeHandler", "RandomThings", "RandomThings:imbuingStation"); + } + + if (Loader.isModLoaded("GalacticraftCore")) { + addToStackMap("micdoodle8.mods.galacticraft.core.nei.BuggyRecipeHandler", "Galacticraft", "GalacticraftCore:tile.rocketWorkbench"); + addToStackMap("micdoodle8.mods.galacticraft.core.nei.CircuitFabricatorRecipeHandler", "Galacticraft", "GalacticraftCore:tile.machine2:4"); + addToStackMap("micdoodle8.mods.galacticraft.core.nei.ElectricIngotCompressorRecipeHandler", "Galacticraft", "GalacticraftCore:tile.machine2"); + addToStackMap("micdoodle8.mods.galacticraft.core.nei.IngotCompressorRecipeHandler", "Galacticraft", "GalacticraftCore:tile.machine:12"); + addToStackMap("micdoodle8.mods.galacticraft.core.nei.RefineryRecipeHandler", "Galacticraft", "GalacticraftCore:tile.refinery"); + addToStackMap("micdoodle8.mods.galacticraft.planets.asteroids.nei.AstroMinerRecipeHandler", "Galacticraft", "GalacticraftCore:tile.rocketWorkbench"); + addToStackMap("micdoodle8.mods.galacticraft.planets.mars.nei.CargoRocketRecipeHandler", "Galacticraft", "GalacticraftCore:tile.rocketWorkbench"); + addToStackMap("micdoodle8.mods.galacticraft.planets.mars.nei.GasLiquefierRecipeHandler", "Galacticraft", "GalacticraftMars:tile.marsMachineT2"); + addToStackMap("micdoodle8.mods.galacticraft.planets.mars.nei.MethaneSynthesizerRecipeHandler", "Galacticraft", "GalacticraftMars:tile.marsMachineT2:4"); + } + if (Loader.isModLoaded("ProjRed|Transmission")) { + addToStackMap("mrtjp.projectred.core.libmc.recipe.PRShapedRecipeHandler", "ProjectRed", "ProjRed|Transmission:projectred.transmission.wire:7"); + addToStackMap("mrtjp.projectred.core.libmc.recipe.PRShapelessRecipeHandler", "ProjectRed", "ProjRed|Transmission:projectred.transmission.wire:7"); + } + + if (Loader.isModLoaded("gendustry")) { + addToStackMap("net.bdew.gendustry.nei.ExtractorHandler", "Gendustry", "gendustry:Extractor"); + addToStackMap("net.bdew.gendustry.nei.ImprinterHandler", "Gendustry", "gendustry:Imprinter"); + addToStackMap("net.bdew.gendustry.nei.LiquifierHandler", "Gendustry", "gendustry:Liquifier"); + addToStackMap("net.bdew.gendustry.nei.MutagenProducerHandler", "Gendustry", "gendustry:MutagenProducer"); + addToStackMap("net.bdew.gendustry.nei.MutatronHandler", "Gendustry", "gendustry:Mutatron"); + addToStackMap("net.bdew.gendustry.nei.ReplicatorHandler", "Gendustry", "gendustry:Replicator"); + addToStackMap("net.bdew.gendustry.nei.SamplerHandler", "Gendustry", "gendustry:Sampler"); + addToStackMap("net.bdew.gendustry.nei.TemplateCraftingHandler", "Gendustry", "gendustry:GeneTemplate"); + addToStackMap("net.bdew.gendustry.nei.TransposerHandler", "Gendustry", "gendustry:Transposer"); + } + + if (Loader.isModLoaded("Botany")) { + addToStackMap("net.bdew.neiaddons.botany.flowers.FlowerBreedingHandler", "Botany", "Botany:flower"); + } + + if (Loader.isModLoaded("Forestry")) { + addToStackMap("net.bdew.neiaddons.forestry.bees.BeeBreedingHandler", "Forestry", "Forestry:beeQueenGE"); + addToStackMap("net.bdew.neiaddons.forestry.bees.BeeProduceHandler", "Forestry", "Forestry:beeQueenGE"); + addToStackMap("net.bdew.neiaddons.forestry.butterflies.ButterflyBreedingHandler", "Forestry", "Forestry:butterflyGE"); + addToStackMap("net.bdew.neiaddons.forestry.trees.TreeBreedingHandler", "Forestry", "Forestry:saplingGE"); + addToStackMap("net.bdew.neiaddons.forestry.trees.TreeProduceHandler", "Forestry", "Forestry:saplingGE"); + + } + if (Loader.isModLoaded("ae2wct")) { + addToStackMap("net.p455w0rd.wirelesscraftingterminal.integration.modules.NEIHelpers.NEIAEShapedRecipeHandler", "WirelessCraftingTerminal", "ae2wct:wirelessCraftingTerminal"); + } + if (Loader.isModLoaded("gregtech")) { + addToStackMap("pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5SmallOreStat", "Gregtech", "gregtech:gt.blockores:85"); + addToStackMap("pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat", "Gregtech", "gregtech:gt.blockores:386"); + } + + if (Loader.isModLoaded("Thaumcraft")) { + addToStackMap("ru.timeconqueror.tcneiadditions.nei.arcaneworkbench.ArcaneCraftingShapedHandler", "Thaumcraft", "Thaumcraft:blockTable:15"); + addToStackMap("ru.timeconqueror.tcneiadditions.nei.AspectCombinationHandler", "Thaumcraft", "Thaumcraft:ItemResearchNotes"); + addToStackMap("ru.timeconqueror.tcneiadditions.nei.AspectFromItemStackHandler", "Thaumcraft", "Thaumcraft:ItemResearchNotes"); + } + + if (Loader.isModLoaded("TConstruct")) { + addToStackMap("tconstruct.plugins.nei.RecipeHandlerAlloying", "Tinker's Construct", "TConstruct:Smeltery"); + addToStackMap("tconstruct.plugins.nei.RecipeHandlerCastingBasin", "Tinker's Construct", "TConstruct:SearedBlock:2"); + addToStackMap("tconstruct.plugins.nei.RecipeHandlerCastingTable", "Tinker's Construct", "TConstruct:SearedBlock"); + addToStackMap("tconstruct.plugins.nei.RecipeHandlerDryingRack", "Tinker's Construct", "TConstruct:Armor.DryingRack"); + addToStackMap("tconstruct.plugins.nei.RecipeHandlerMelting", "Tinker's Construct", "TConstruct:LavaTank:2"); + addToStackMap("tconstruct.plugins.nei.RecipeHandlerToolMaterials", "Tinker's Construct", "TConstruct:pickaxe"); + } + if (Loader.isModLoaded("chisel")) { + addToStackMap("team.chisel.compat.nei.RecipeHandlerChisel", "Chisel", "chisel:chisel"); + } + + if (Loader.isModLoaded("harvestcraft")) { + addToStackMap("tonius.neiintegration.mods.harvestcraft.RecipeHandlerApiary", "Pam's Harvestcraft", "harvestcraft:apiary"); + addToStackMap("tonius.neiintegration.mods.harvestcraft.RecipeHandlerChurn", "Pam's Harvestcraft", "harvestcraft:churn"); + addToStackMap("tonius.neiintegration.mods.harvestcraft.RecipeHandlerOven", "Pam's Harvestcraft", "harvestcraft:oven"); + addToStackMap("tonius.neiintegration.mods.harvestcraft.RecipeHandlerPresser", "Pam's Harvestcraft", "harvestcraft:presser"); + addToStackMap("tonius.neiintegration.mods.harvestcraft.RecipeHandlerQuern", "Pam's Harvestcraft", "harvestcraft:quern"); + } + if (Loader.isModLoaded("harvestcraft")) { + addToStackMap("tonius.neiintegration.mods.mcforge.RecipeHandlerFluidRegistry", "Minecraft", "minecraft:water"); + addToStackMap("tonius.neiintegration.mods.mcforge.RecipeHandlerOreDictionary", "Minecraft", "minecraft:iron_ore"); + } + + if (Loader.isModLoaded("GalacticraftCoRailcraftre")) { + addToStackMap("tonius.neiintegration.mods.railcraft.RecipeHandlerBlastFurnace", "Railcraft", "Railcraft:machine.alpha:12"); + addToStackMap("tonius.neiintegration.mods.railcraft.RecipeHandlerCokeOven", "Railcraft", "Railcraft:machine.alpha:7"); + addToStackMap("tonius.neiintegration.mods.railcraft.RecipeHandlerRockCrusher", "Railcraft", "Railcraft:machine.alpha:15"); + addToStackMap("tonius.neiintegration.mods.railcraft.RecipeHandlerRollingMachineShaped", "Railcraft", "Railcraft:machine.alpha:8"); + addToStackMap("tonius.neiintegration.mods.railcraft.RecipeHandlerRollingMachineShapeless", "Railcraft", "Railcraft:machine.alpha:8"); + } + + if (Loader.isModLoaded("AWWayofTime")) { + addToStackMap("WayofTime.alchemicalWizardry.client.nei.NEIAlchemyRecipeHandler", "BloodMagic", "AWWayofTime:blockWritingTable"); + addToStackMap("WayofTime.alchemicalWizardry.client.nei.NEIAltarRecipeHandler", "BloodMagic", "AWWayofTime:Altar"); + addToStackMap("WayofTime.alchemicalWizardry.client.nei.NEIBindingRitualHandler", "BloodMagic", "AWWayofTime:sacrificialKnife"); + addToStackMap("WayofTime.alchemicalWizardry.client.nei.NEIBloodOrbShapedHandler", "BloodMagic", "AWWayofTime:AlchemicalWizardrybloodRune:3"); + addToStackMap("WayofTime.alchemicalWizardry.client.nei.NEIBloodOrbShapelessHandler", "BloodMagic", "AWWayofTime:AlchemicalWizardrybloodRune:4"); + } + + if (Loader.isModLoaded("WitchingGadgets")) { + addToStackMap("witchinggadgets.client.nei.NEIInfernalBlastfurnaceHandler", "WitchingGadgets", "WitchingGadgets:WG_StoneDevice:2"); + addToStackMap("witchinggadgets.client.nei.NEISpinningWheelHandler", "WitchingGadgets", "WitchingGadgets:WG_WoodenDevice"); + } + /* Witchery */ + { + addToStackMap("com.emoniph.witchery.integration.NEICauldronRecipeHandler", "witchery", "witchery:cauldron"); + addToStackMap("com.emoniph.witchery.integration.NEISpinningWheelRecipeHandler", "witchery", "witchery:spinningwheel"); + addToStackMap("com.emoniph.witchery.integration.NEIWitchesOvenRecipeHandler", "witchery", "witchery:witchesovenidle"); + addToStackMap("com.emoniph.witchery.integration.NEIDistilleryRecipeHandler", "witchery", "witchery:distilleryidle"); + addToStackMap("com.emoniph.witchery.integration.NEIKettleRecipeHandler", "witchery", "witchery:kettle"); + } + /* Witchery Extras */ + if (Loader.isModLoaded("WitcheryExtras")) { + addToStackMap("alkalus.main.nei.NEI_Handler_Cauldron ", "witchery", "witchery:cauldron"); + addToStackMap("alkalus.main.nei.NEI_Handler_Distillery ", "witchery", "witchery:spinningwheel"); + addToStackMap("alkalus.main.nei.NEI_Handler_Kettle ", "witchery", "witchery:witchesovenidle"); + addToStackMap("alkalus.main.nei.NEI_Handler_Oven", "witchery", "witchery:distilleryidle"); + addToStackMap("alkalus.main.nei.NEI_Handler_SpinningWheel ", "witchery", "witchery:kettle"); + } + + + } + + private static void addToStackMap(String handler, String modname, String item_id) { + final ItemStack itemStack; + int meta = -1; + if (!item_id.contains(":")) { + throw new IllegalArgumentException("Item ID missing colon"); + } + final String[] split = item_id.split(":"); + item_id = split[0] + ":" + split[1]; + + if(split.length >= 3) { + int mIdx = -1; + if (split[2].matches("\\d+")) { + mIdx = 2; + } else { + item_id += ":" + split[2]; + if (split.length >= 4) mIdx = 3; + } + if (mIdx != -1) meta = Integer.parseInt(split[mIdx]); + } + + if (meta != -1) { + itemStack = GameRegistry.makeItemStack(item_id, meta, 1, ""); + } else { + itemStack = GameRegistry.findItemStack(split[0], split[1], 1); + } + if (itemStack != null) + stackMap.put(handler, new ImmutablePair<>(modname, itemStack)); + else + System.out.println("Couldn't find " + modname + " - " + item_id); + } + private static void addToIconMap(String handler, String modid, Image image) { + iconMap.put(handler, new ImmutablePair<>(modid, image)); + } +} diff --git a/src/codechicken/nei/recipe/GuiRecipeTabs.java b/src/codechicken/nei/recipe/GuiRecipeTabs.java new file mode 100644 index 00000000..7bd754ca --- /dev/null +++ b/src/codechicken/nei/recipe/GuiRecipeTabs.java @@ -0,0 +1,174 @@ +package codechicken.nei.recipe; + +import codechicken.nei.Button; +import codechicken.nei.NEIClientConfig; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +public class GuiRecipeTabs { + private final GuiRecipe guiRecipe; + private final List tabs = new ArrayList<>(); + private final List