From 32659f0a4927878f638919e8a2868daa6f8ea852 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 18 May 2016 11:25:05 -0400 Subject: [PATCH 01/15] Remove traces of 'dump' buttons --- .../mekanism/gui/GuiChemicalCrystallizer.png | Bin 18862 -> 8642 bytes .../mekanism/gui/GuiChemicalInfuser.png | Bin 2855 -> 4250 bytes .../assets/mekanism/gui/GuiChemicalWasher.png | Bin 3116 -> 4571 bytes .../gui/nei/GuiChemicalCrystallizer.png | Bin 20965 -> 10973 bytes .../mekanism/gui/nei/GuiChemicalInfuser.png | Bin 19318 -> 8386 bytes .../mekanism/gui/nei/GuiChemicalWasher.png | Bin 19242 -> 8276 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png b/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png index 4d735ec8035c5942ffc972d0ce10f037fe657999..3085e1e421c981ed85cd8c637ac50e3507b8c69f 100644 GIT binary patch delta 5284 zcmc&&c{H18+YeHzwUl%yMeL?qv?Vf1q8(}(ZKGpaO9e$~g;Giz5fAOxszEL3qN<6G z)-ISokbULQ8@a6?X~r=RNa1e_iLgulu>K-|za}=Un$q zAu7Cf&b8gJaL(D;tKNA*39Q{PdYy;>J1eRZh*a=)qSl7p8oo!pjGbfR&KSdCwy?cK z{Du_bZWRPET=@_&RK=WlOBq6hDSt;SQ@%!A*&a#UQ2=QcVM zjW@azxhfloMJkTOc?}p)X8lb+2n2cJ;d1Dw%L=m(&~XNgez!B?lLz;n(aYMlKjN+S zjo_J$rTUPWD;q9v&~Oy~xUC*MGf94%_hDriR&nC-bn9@L=@2evy(M9%1A~b_A2^)c zib@G=%BT84E+;U{?oY+0O2l6Zr`SekI3MY#XVN3>AxXlN}F`GUu;qg zQcJCR5gPNOqV{EDF6i>X(eD*mZd8R>LhmPsJ5(hF73v>>C`FA_K7L}P9&EJnJCKpr zi(INeD;5;M0c=D!Efx+^6&6xoUjtKesIpnyZ*7vL-$ z3p)YCE0#&V_R;`Z!T6yi&Ah&N=cy+-*#ykELqFridFX8SHy$;GCACj_8S%r|92NwT zUy)Zu!qx=Q1T+NaQ}WvE^O9R=rgUYJj972;AOl(a-3FJSppxeG>8jfEsATcNwH@jl zj_*s=F>yhQrRRE5-dzK0OmizeayF^7lZnper&JhXVCIvmy38B~E9D;em>uY>YZySh z(u_DKIXCS-GX-I>63`=4FNEb7&e;aLi1LWA>}nM9*{_%1TMOTc4Bqaj&7saI725>^ z(Jst90WII{N)4stjjqERA+@(J|Zl&{-ZCS`)ccW%fi)4{E#JgQBu zGs7l}GSL@tqcQ<2NY;i9;&}z4(yX1f&tGn{4K}a6ReRLofCkOe%m*6P?eo=ZGsoZh zzzkfOv$GpINT^3P2)`xy7peFON`N7DUeTymcHwiGAl={{-?(ngD)r~vt_B_>UM(3J zR@agHlS1ex{Kj4R`fU->Jx6GguyERneM}fKVuo>vrwd(XAd+hN7O}sgL7rXb`rHej zt-7%U1dentM^ZVrwSiBF)9HEDXjXqF8=0T5+~}G@ANQF}Fof3fO=EQcC9W6575!nN zp3Ay#gv_DL;cph^6k!nk#IF{SEStDHfmRV?<4F>GO{_3yrTtiTYtIP3X=70oXt|?C zJ%A;+@aV$V&2}(Jq;uyTz3chekR zLv;5jH>^#mcyQNCN+K^oq$hoP{kZp4sn{K4eJ)bTIbzT7^1!{COJz>s&e>Qef@Q|J7PAO?;9M4 z7~&=Dac>LkSY%IiJu5)$lE2+>ZJKPrtH_7rB5yuMgwimfuKeS3bDb;G#jo9PnBP^~ zKhOZwYqr>*Wzs_{?BW;*?E_(PbreCD;dbFvWJ+=_!}WdPkY`MXe-*R0iPQOzz=$6q zWwtCO{my@1u6toVa{uZ}_Sdt0kaQA4d(|jCh^7Y(tcN(O3*kE3o4Vi)5cC6BC|~pj zr7i1}R6Y<_{x&3U-wX=WUyWlZR|8#iGi-ck?L0OL!#Yrn-wij#S*WbeaYPM)7;kHw zugEvj3y~TLp&OZ$j$hqG14Ck~)}WQJL!>>D{Hw_W@9yGwoUeF{ZrU)Q0-}kwh3iXm z9k&K;ci;yMWSK)#X2w|w?53>wDO1$5Nv7qU!V+XtSEpp`P5VkymbA8Qy=i5xc|Mj9 zEG!nsydp5#=6Gs2sZ_)n9+uvNun8dQRm=CJ(jOoUcx!rC^m<_gk3-AZ$?Do5}zLDU=c?lwbU+xIg=;e(`{>1 zE8f%I{|KXfm(9Kt7ps$8@j&`xKyCNBSM&^~!|6a|f&+fZHBO6&v|pH%h?fbpyaIhU zSjgguogbIy`3L{lJ<5cT%QwOpCE zRGWBd@Ek-yFpN~>eWnFu%WuIXxPe5U&m=Z@EysqL1!PF z^H5OkdXYg!;-2(2l-kvIJMRf&oH69QTy60ILR@k6hlQC2Z|gg)*VKjw=IoMhP0G)p zQgLVnkX;mBd6Xrpr^hBdD1yV*#0<;!o95``#ye5spY&wMNuiM}1K!V+X*_LavE~_l zbq6j97ShK;`_kLz?gK7(qhXH}mE4XB-RutZKB2g-Oe?Qtr4q{LmE*ea8QAV?ddo8f zXn7NpuQfA(h7x>aw4_^04-+_$aTC5i2s}Xvvl?8P0lZN3(aW7Zd#TrJ<6w&9=A_Pe zk#Z>7rryoyfc`pr9Eu6_Vh>$*-q^2bZ65$eO&_O_$<5bl3)Bxf@@FiPy%i6 zG>A2=YbZ=gWW{UAh46@enSRzbDEixruW;@`$H#-V+c?$txlOdA>q*ZiLNEY75fcT! z^gJh$^(3!(a*&@@;f;+aeRAvRX-9_C<{OB2PMXE$a}@eq8t7Ljc3V+~=a$7L<6pPR z#1@vUF7l^K8toB0PttLiq`Q;!(tUY2=M#IeOeaxz;v^>zn#lGxYn2-C+FheKZoPXu z-RxD;hMg3$>iWuUjZss1z|=W^^Hmt+Zbx;BABzye_D(1C`iR6X+PZkA;2P8}?k93} zRS+|QyiK@Rv(`*YbGngX4xF&#`ZqD}oYyeJ#f?nlMJiPF0Zy_S`IsGgWwt7CZcPhkpppa2JjqRz- z0UES&V6D~lhx3&_nzVTrE%y1jPEwlQGSX>nAa*fY`uH`gv8^cdB2fRCHXL1oPxUtEPfxB&RExqu z%ZNjJ1EWLvMOp9| zCOjr6f~=czBAnLvr01KU>#UXzrwG&7d<8EBdXz12TtCb5&GjPzm zIzP96d-*}ZSHNh|Q zOiDfDT$qStp=^C^{;EUDaj*GTzB-Flt?j&}_o_u)2vr(WaIV0;5XQIFKWdOTwbQLo zt4-fqN*_nJievN4@Dj~IdQPNyD}RmTZzeq%!86DU;2j%II!u0b9~(9fykrmhaGF{@ zc~EaHwiH55*OZ|o0~ItIf6;Zmy62IwsDz;VIt0RgvCk=*bM%O@n0WVv{?*ys8T*B* z)u|VK-n&-)t%U(a`}ouM3CXU)a(`3HTE`q*e%@3-*}9IlzKj!u1~;^s z50bCnc>w3f*@KcE0``otJ4u3v`eHL|KnVTGO(e@(8tJ%iicOsF)2oNvMPhrd!t5(y zs{vxpJWAGG_SAyhJ3)0`&xB_ zpPSGo*g=?;VOGkV5#1vM4(l2Us(6rtG*9HxPXH@^3m~7VCCeYs2>GDBW)SB17)(i( zPo`Yyn#d=Waq1S;0DRL3BsJqUa>7x}B#(oNp^DA2-qi8X^4qE4V~6CU{-$Z>E$Y23 zv7n;vs|(w-zuO=m`gfF{@>Y!aUcPFn`8w2{yA^BzDl0yJRJBM|zIxAbV~$Ch_wQSP zD@|~VSWEeG#FDY&_5b#d+$lhf=R~n5T21aVuTxNPQiuZ4w`v#MPE`tKT1_@u$bBkQ zKMqK>6i*<#k5Hi5uo=rrQeeG={_AD2fP3s{g0lqO?60bn;(Mp z<+r4BMz>XNQ-yLuKH9)bz@;W!P{G7;oR?}8nyT>c4+H)rYn_+?T0uxwL~N|}*WHj? zz5Agx)^1!z*#OiDbLpE^U2Adn!Sq*?NBIcD**9f?S>NpJEN1l5{K(I#8_ErzNF&T^srlk+e10som; zr%jU@Q|Xs7v^1FB8~05OcB33&@1seC;-0G?^K&>GpT1AZPLRXWo;*ZplyuxbleB~@ z`on)Vo54}2ei%^=wzQJBOQMjJtXeH^oUe1Quj-LwRE51OO3PwxUpdUW>!f<^f+D$E zmsF+}E$V>la#I}{YO&W|u3MgF-?(S6y4=!F>i8izPOgV;XmRIV>hH>cFK6AR^5m=$ zoet($r@`eGc1mwoTDM&1mO!dekRn!ow`TU)oKz%2d?hGQ+hX|2mv<3R)Nd!AQcUXP zaIo6jcctAmjm6{fcUOm-FXep!PS-|gFVup1!4U;uSX!zQSDW;U$T%%RI~L>!DLSqF z0<4(X2L40i_)kk8Pjg=4#&H^3UWD~XPo-%Zdr8$4GnI^2`hBsmHbLS&QnJzH_;W>T z8~;#2?SD~UEa=EO2-yk-nDVpvf1~by&DKFr8h@uU2aBC50hh{G1{xJ=_QOU@lDHF}bJt6ym5CT$OlZ@V%6;*A z*R3bsG%3qE)%(>{>$pB)`qF^~oIgZ2p7+z1TKcf>j}DF4!8Y?PZG%-q=OvL?-XKy8_15AN;bjN$a03 z%)1SU?WgPrewUhemnunbTA^n^jg|2eI$E}Dg2XE-tz!+ zpN^}9D!V*Wvu_nDbXAA0fUdT$AGV)+mw)cnLEpzU;-PmbxrPssTZ%pmtlJ(c(N$P> zVB1+gq~_P(uLj=wYw(HMns!SbjC(rAbKrQgS&_$!$n7~)rhhpub-wEIM!69T#d;GS}y^N;nvS+6P#X~?`IAeFHZaUB7cAHp zX;xzqDS0}Pu${Azpu-PYytqq7YxAQMC zIQ{b{*FJ+CEF}d6RWiOU@b?LSu+8NKx^5NOZpTN_gp=FU8#ft7HAQMfNwh3!DPa2U zzuf3!IAAqkGhjYoGH`HUo$J59G3*Bnb7X?H90i4K) zI+QBo69$CFn&tQGX$lWxu1HkF!U7+yJY*p4o)Z<9BkH{+r}h56YhzaydxT4*vtU=y zs;SQdHdp#<1_v~_ukA?ch&gn&J`c&WjI3)>4oOKmkkRvJh`kaXW#<2fG4>Op@)InB z2P?k0De2FCcxHFN*6t<|^`5m{do`JQ_JX&R71xKe4QfyNzPlGEbU^*O+CRs?l$&l1 z5&Gge+}{=IxUL|YrV_p4OVOu+h0e{*ZryP$ZmeeGo?;QklaaOdz#+eNA8&hty8?`8 zV1WmKli=17z8nAsBLLu7GXMl~0HB=-02+S)fQ+r&ZUY=>`wPRso&^9)R*nA&0as%r z!A4QGAzn|kX~8<7&4|?}Rv!bKwz2i>*!ti`0y7~{Nx)ujvW^FdN+uG#beR4uHo?n_ z96(|s7&Q0$C7e?LfC?g8*|F{L`_M!>6+v*NyO0omR0bFc05BSU3<8ltV#8cW?qnKP zhL>L~10%a)Wo%XO@_2?0$%AYVz$94)m{<`5C`6R2j0SEo#t#h!ppw`Gm><=P#zOmH zWhUaH!SCbENEz6K37dkI(Hc((v%{Ogbm&YHOa-9=C(0`-z|>F(1r=qKg2HZ?qP&6< zQb8W6h=MC9pq16o3aYTFM+UbT{Dxt=x}hy}^{3K-5?028&1RsHNMB!Hgs&2U&U8mA zpin5JydqLj5e{0wS^hLO!4FPjZJ7-6J&rDkMP!m0Y%-k&8;?tHp?kBjGBV?drk|Mg%-}_6Y&YPOW*7E@oOd*|<_PZy`%AY|(T98!kH9ze;$&dUKw{gv++r(6u93c$&u4o-5iNK~at>|zSdR2}IH*ut_*@DyqQcmEZ~}D+O>KqR`6faCtSfy!@;nla`Pec)Bau z&3{e|MP(}mb+nQaT3K~=j9He@7~s-zC9nzqQIy%Xv*NfC(Qb4mmB7Z4sRVZt65Iwb z$eG4jmeUgotwZ;sGr?|=a7q~De9iNEfhEmUMT6T*qLG+nBFtj1_V+4hcA#07^G4F8 z6TQdRh8B%TVu2&dnl;kkcu%Z;ZG!vU*6#{0G7cPGge%z`<0;zCqYLb;NNDlTdm;iXj zb9IHQE6OX8Q1VJdMHTh=gH5*1?eJ_I{9bo_KH~9cLmIe|gES0vCti*`{&KD^@@n$n zd#MqWT;M9oeh>MkUCR}~kO64;*~+-F{MD)jg4Q=uog{THEUx&IK_lt~5; z5rWq&n`xT=MT&XC{E*6kJU&tU=Z@mUM6o0tn%g=vQ6{!~27$>Ujc;aHneV&V^!YG3 z6Q<_F#HNTQ5XTP+9C3WFA-Q6Zb6RJ*HSLL+G$8+92k-~?pXc!PAkp}3Sd*b9tbQJZ zMR#NS5||_{cW?pzFWcy3z_}jK$o!VX+@bkCS$`Z#%=l4(2B!hoCBg)L1q||swwcV6 z_IBgL>E%6PucjyuK447&K2xr<)lgS^{;sptP}dnxYZ{r2Q=G~MX`baZex6P4xRzk) zMZ&47s3@smkkDqRhZ)(ASY!v;tfZApAuEF8+KVS^+Ky5dNY7 z7k@qwtpFDU2!Bz4i$5QTR)7lvguf`j#h(vEE5HQ-!e12N;?D=772tvZ;V%ks@#h24 z3UEPy@D~NR`165i1-KwU_=^Hu{P{q%0$dOv{6zsS{(K->0WJs-{-OXEe?Abc02c%Z ze^G#oKOcxzfC~bIzbL@PpASSUzy$%qUlict&j+Fv;DP|*FA8w+=L69Sa6y3Z7y05^ zJaeUzL<8?p`hpiGSA1<>4_>yE9KX0}Id$IxfZSM9eiq>l+N>D2v1O9kBqm_#%^)$s ztLKj%roS1#6KbfdW#!k<@kW96Po9*B+0*jHN3!fsguzHd$py!NK;s_sL4RszXJ?k3Q^w9-TL6Q@q2;8rQd3hSEsXm6`^kj|DZhMv zEo?RjUU?S=!~qU?0Um%&+=&O?Mg=Ohmg7RlK8JrREiW&xx{P#+5fc(0?rpb~I`OT7 zEB#HwL~mp9Mtq{|iqbE2K7+$c5_tIHxNikLy+wU*hDWcC94LI~Q%&U-1xIrW10PiL z`i6!Yyexz=^fcbT---pFd`(JJR&RH~i0tYUgxAAG#)My~O(_{^#h2-7qpXd~2QxPV zZWo;*{kL@_Yqs|eRaC_1vy=b$AmI}c{NS&fR{A?#jo?w-j+=3yUD|+uOT~g4Hui~) zEx!5WWMz_K)KF%22-T{~sA<1TQ}*G!*ycOl`)_N=Wdq@& zVw^|WokDj1vg9BVCta>1_&=`KS?Nl)P zLHJN};SHt!BI76xDbXt@bXFUsbr_vfRuIWBP%2jOi?Y4tQMoJcVxLJK>R9k)2a#sW zV@ZQejrgQ%foTAoqZd8)GQ6bWly53|4>v8*_kER~)76Dp4~ydW1czXn`)}qhDQrw0 z+09*aDsPd$c+JL>dht!wPpup7*Niwan+oB_@nxHh8hiI~w1M5Va9M1_nW6gZ?SAB- z8#Zk>_mWs0`8Ml}A6u;dn?hZSKdcWtKUg1c^h(LV+VhC1oJHEZ8j-q7uYJ=LYd2!= zZ#2AgKNYL03rOpJD^_JXQXI}nB-_+~tvnrT@EinRTxdl$hDUNc0vuL}aSClm8b11w zw+2V&TjTcMRh7JK`*B;JWAv)ZJ?HBh6MY}MXZ=kq8L{_o@5uS+p6%9=rCrBuJ$JjR zypY%6=ohqlz@jngHahOwwS@L|ii$Sy+;TARK1IcmBB7k_?EfeU+wa6|GB?v5?c=_E zS}M2V@FtCrTm8HywNTUM{@ZV^brr{Hgr=AaUoVyux4y&;Y1@9(9!qb^J}7)oJ8fp2K8+Be~GV+iA!Bnd5`BY%~RtI#4<@s9RDP0k=>ONp@Tqyaj_86V_d&z3*`VFSZ&kteu!U3TSR+w|a zc?vz_Rqb0j$2)_1c~1iS3)gzDHjDneC*b#_H6h4D;n_P@`a9$I+f`qVvI-#r`_;ZB zu5IYS_Qk#&9C`PwuHczd-svH(dBW98<^d8pwMXjNP1yAAq8I+J-sCfs{j8{0ERNUyGooYiH z^T=?|{fytfSL^aA1Q`A?iu#a}uE6ynQ+Hoqt+Zv3?ALEcvE z<9lrdW2kePJu3;-ceUDAI*~HX3R|xkhJH~$qrUIS?ocO)Y36F_`p15e$+`zc} z%l8}m6>7EPdrdS=!%C}Mgq>UEWrMHiReVx;8PwA-GG?*u$)?8M0P<0d$SmdmxPruNaQHXZyV8NWjR?2*(y`WXj% zG0xp38Uf3^FNUSAh7JBR{Lw@bzBI3GLs~YE+tCM3nhFP5yveRYbNlF4aqm*U4QuRI z%Ek$)7s*=&CU4JMQj0sA*qiB??cRailvm%-|J&o&4!_>9`nRs#duVjnx2xd6cI7r< z4wI2A=I3Tf%F$bmS+K9$$JpYE zpYk>XS4UfFPkQKYdGT_jS60`P_hxTupZ@Si?1!Xn@{bj2`z|-Vh>r@oc}CiM88`sv zgldZFu0E-4zy-7=Sh?|x(2bq>{nh?XAfz>V2la6k*ITQ@6QUJK_G6#Uc1)4*WFfY(RsTZR7Na&I>_ zHfn@Mgoum~g&2W>(O{rnT9HHAF<>MW&f%U1#xem(UT5{5pt0;Vz;pM$)0)-!fgy>T zife^Ap<99R@TH|km6ko01k$uL-Wrrm9@?5ep5s3>Ele>!5sGLm!~u@Y!TI)U6UGL_nJPS@IuC30L@_d4bsG1sM#YG!UY zO+bAS4B%{W)q}N22cbTjdh5Z|b!`?_Et;r*IB8a*LTQWd#OTQGaFV$4yRh@fqR)S& zJa}54Eq$~)Z%&ysH!%2XLc%3G!T-{mQ-$Tgt`S1-EPkF!w03r!K*))wjCCt=Z$+LU zNY;YCdC@l9&np*`zR(6d9jZ<=Ef-7wYjiZ&Xy>wKKs8@f(`Y9ux*&yO3w-wb^_r&o zK@p*O3bh}4Fg-M!S>+sGE1|cm|6|+f0+DaTDJy7EIgig<&CwOzRj(B<|4S?Zz{gO} LME9rtA%Tz}35Xa#L_i4v0wJK1kOjgbnAAET&|-^< zh%6NsWRW6L7eH`WQj3BJh-Hxq0|E*$ERqW1d_h!tbhhJ}bLL0$C-3*>KF_`PxyyG> zj(E5^D=Dm2002PAWh>DW03hHI0?2<3eo;7up|U5gr}GxzQj7j50Kg7~d-?Kw$=k8P ztO#UK2#ZEX#zaJdRsdiZg9VQfbY2iVCSpI6i;ck{7A>&gS$2&=z!yz;`)~+fvIpFe z#i7GDBdw5T2zv!M9B#)63B`I6otEI>6Alr^<3(aoC_bN$H58yztO}!Xx`- zF@%r7K)wHU-0w62Q?>)G$z&{%&IymEhd6Oq5sSh^264D_S&%ry+bEZ#WWdEVvEfWE zFNhgTcOlw?Ovv!?5NwD!4Q)=RTbPCfqeD$GG^o-Cw!v6i+Mzyx z|Dgs;>>;e+s0ccfx5OUuU$QTQzh}2YeUS2EqrIvBTRlE>OtNtxT41bgh!zeQb90iF z!)6lNiRg$nLt7Jx4n*QR-uKXDPT%-+`B1GTTJ*o8T?YMt)}0g12xkWEC%$(rE5?5= z*PG}*LbJ@3tmm+x30RIG*#Oy_+o3+VTV@Y(VjVg3ARde3#bWKZcaZG`xJMX^$Kr;u zBH@mXaATivW(bSV-MFaTAFP*%>`<~XT{gCFcEaKk@xHt1`i;6Pe!Kc4nDL^g>ftJ=ld7+#P7I)$ADRqy3};9tlEkDc9)_6;V^(`J5` zPL1@J+e|neq%>sq*s5K;_^AAxarA8PIegmjTV~q#=i&$1cDC~l)i+;7pI%+!eAbcg zX_!R9FLd=|!h)~bro8Ittht=lxdWfO@mmp|-=ErLoj5h~kg39nc8^16BinVYU<5uq*E!ne&awJ&Kg#G)}Y`boExr^e3t}QP|CwD%QNN=mSi;m}{pXt&g@(T=YT~pa-D%1`!)mUlv zX*m-^HhsHO@3w8x7vr?EO`0XUyKlCSlCEpAV}D2%rQ98fLM&htZMALD1J{S{+F+>Z z8GRb%_P%MZXe8;v2r;YWhPx-;?Oeu!uX%F6C|k0%?Hh&;dZ2P67Poch#j3}DKd8E~ zM_*Ss^`zA&0V8dA880Edj2S#FnQij@YpzIV#~1tO@+AvU$@MeLygqx zhr82@dkUmJPqy)#NT;c`YMG+=@@yu=ZTiGO4hMB#E5Xjvph=^?Q_7ZvQQR`;#hQ6d zVU(uZhrf~1sxzQrnkJ*|^X-}n^tglq{RUcD=1+KC!*OaVzbdcsN87ZS7FzGB{^ao% zroOw+I`IXMv2zvAy-GyUaSJ_<%W54ui}3d=#<~odwHAi%MSg$^6lS5N3S?A$y99^eWHO;9L&a6k_Wfdne6{_INtLMR6ujo`o? z2vk>5UXYf`8iBzC7y>*P0y)Z-DCGzMvla3oo8W*2^5zd3s=zQHOp}8Vni|nO(3$?9 z&i zd-SHJ4bhz4sM-6i&`!KYRkpI7Ar>+bHx+C0CTH%mPuebhJALKb$L2=-?0 zJ%f(*m7J%hx4uf4SO_fYudm9GmnsLUoA#)mv;+fZ$Zgh#W`NnbT-om$*a8NATB{>c zemepVY-qb|D#U=J#r5{6|HABu060l({s}g`9aLbqgHlr6Iw5L zX@_BB6&Y3{KYcXL8&;H*eLh`FI93XlEMCrIGezt2?fMk-Ox%G9aWE-Au3&@srE>m} z+=P`^CDn8u>Mo&oZ_QDNdr9Xj2*gXT3#Ow_4w@(_}c~Dbqtybu-R_IdyV!fHk;_g4sS|}O* zQRJv_O)h4uO_kco6`$6m}PH@Xkou#dF(U_-T6blm?! zzW2sF{%c1%J9*5t4uSgxeBX54}@GDGE909-9is+%DKqx{aVF*CLl?^dLq$igV z2?l@+c3jMT&=~+0#c+Z`MWNna6c)s_WlZPTO1XR(4FJwAQa*!q5ELPqU?hh}MGaKd zqL3Um6&2#(jq~Qafl-_thXi2YA)g@Dp@S?k8|AVU=`5wd1-PJyfs}Hic|wYmikhiQ zf#d0IEDAZ3B05M#&5{cB_CvZs0ubq7>wsb52zVrkY>RiWC*$!pNCFOThsEQt1TqGX zr`VGycp`G{LBZVw>qhEiWRWnc|@S+!LW8;ZZw?;v!VD3IPg#y(KLt^ z%LRENPZ|{kf3anA*c3LNNy3950mEjIA~0m8eFTPSPjiJnL%_U6Yb{fd=5`{ zbfpoE^<>g6p4U#_Vf9?$h zwV5h@ovM`FwNpu)EKYvy;qTgDp+n!1llpV-_uj3Ww(kv2IF^dNDYq_t8nnItXZiud z%O&#QZ%vy^fo*W=mJ1KfNebT}M*A%azf+TG193s2fuKvW|3VJhA(2@EtELI&f^%spdG(V8Hf< z(Ldh4>}j&^e)y7^Fj04QbCs1m>w0s0e_gO$Vbm|GhN!yeS~C|}9CqvLN%WpcLf@p} zDiRSr!n?!rs>`ayc-1Zp^R%z+q4)$Z+jZhC(2 zyTbhN14VM?rI5@(j+OSA)+UiO^+uE@+#T;+)R>fUG&`Vt&0$$hj74JCB*iD&ph4Zn zBFc7UUG2>a&&wDYm-V2l%_g%ZD_qD%f2j+4GL$mvKd|p%uG65_q_l2(k%3+L#rK1& ze3eHUN(+Mz(klHj8}0|Mw_aW7f9d_sfd}n2Z7LDo@?s10 zFO~rXJ5KmpqqL8vHtwnOsdg$iR*nl}s-0I0(}SOPRGQGY6xK&}w2j5u^kgM&b?A0a zFf6@D=;UD5e+XOclbCU)wY9Zl*$T5M@?Y~ayZ31Qx>8!Ms*Bg1EtVWCYpyld$g8TZ zVTSA;WHWzymhoM$YhoCU6syv_`p&;x?i@@q6A#=Kmr~zf%hdkjKp*r8m+hFq5J$F$lhi?7Ef4pG@@Vb+SXTBnPN`g{cgA|wY|@! zUd8QEg4w%H)kdCLqhIqLr(JuUvt=Efnz-kNp#ze_vsj&sRtr^&{F^wsdC`Xk$EO7;*Lz1on|5k_TS(1sLShn_8*XTz zSHK99l5{31>%5=3E4+AJv%Ga^I8zy-xmvNe^F+kcw8}ywr^&PJo1c|shisIE9NA2> zQHDjoRMv7P`f|b$j$`CAql-=_ff#$IM2V9 z)TXjbqGrfMuYNeSLh-_9^aao1)elF;Wu}Ltm)-LJ?PbO`U!Hz_UdJL}F`y4@oBox5 z6f9O4&aqyg|9=Oc7C3)7Lf2iHV;$oDc0kno_@blaZ2>6+kgnE<<1c8p=3>J$U{63- zcEa4GYPp=S9HFQ|a5R zbxB@Rt}KX2yUkx0T^y{@xcxmzwZsXrHq!X+(^~YS`uh4Tm&_-Zl8@C`{%CqQ&F*(q zyTLu`e<=Eq#`-`YY>2cC(?wn@e^r;EPsSWgTU0Ct$>=*o7r-btV^f>7SR z3?C{gJctQe0f1pR0bB-A+1`lopg=l{5N@O~Z$SXpbK7VQ#JmYRz(~W@+74mL2%#eM zP`W6L22mP;Kp2Mj`Vkz=$O~}r$w*@#o6RJk(Hss3#nC}ALj2KKJRXn6;LtdnHfW*E zIzVT8hilVW$WJ7ndCaIRN(ha~rZMP7wFRtjUg}lHF z(c#`qG!}(H2L+*jgk-TDs9%HpA(G{IfJsF=P+5%75DFDENB)S2P4oK~Jacd6L--L4 z)cfDZ{Y4WnWkb-~+L~ZS4WWfmeaRt=pm|}K-XSdNT#!Z@pQHR1H3ytelR%@h*xqys z)xwMjGNEWRUjklV7w4@*#cTWc`QWtu@VXdnZ>$bZTNg{AZl&t!>geOBhUo9$f2zR( zyDx(h8bqbD7ubFOOZIQzU)c@O-=#d?XrJo;S>lecZfV9iXoo8h+MvDodp+w`|> zGuev4W4CO_;Pv#keBu2H{l@7hpBCS%wLok3SG3F73v?|9-C~l>SC0}!|2iAI$s?h-?hTl>&x|>kr$t;28$!= zE=H!_jhwL5@+neiX(1~6*EE#~bX3eW{rYBXYkryBuaMq2*3j>um7lb|t>K*5ETOSC zOov-8`gv>5q-{dU>qmk9;s-(pGj2{pb!=0L3*{PKVOJIfd#b>bR?^p1*eJ}aUnYFt z&o<)@xc4>`<|-?mv+AL2?(ir)ryqKyHP$H4&oKRM(pZXdVuwF>WRIZT0AHHckY~#I zKx6s``$D@noS?d4T`LstC8-;!MDL!#Eq#J)SgM{-HQ}U(CCX3vWeYzf+kVjcP5EtO zcQDll=ePg#qb77E$0OCpbH=Z7ydR0><5Ui+O!bYACDuK;(vtN^>G4vAC^mU2T!lP8vi$iiM z%bp7bac6?Uj@RD4ZSpAPoo2h>X2DQW2l?YAu1;ctdg8-=OI;V$!p>^B=Je^M2tjTN z!>#3JX>ZwbfByA}NNs2Slkoj-?)E2eG@3;9!IK}59?Kh38PUQBn!2O~eQUMRlXr<-*$y4Z4~%YhKJ^rZ&01wYh)%eqG1gD~3FGY;yFu=;UK2nx4c~<>O*9QouzKJ*!uX zUZ?ux5*1pD#HC%;%JD@nIx_?(BTpT3K-NevYh-VJIaITH>V@e6SpT8&@hP>q;^=;; z?Z=nJGB5KCRM^3H236HV3SKnF8#Cyxp7*Qy&&Q@!4~@JUoY*ZEab8;;rDTW0Fv}4q za(KXw-`3F#f2~b)DlT(ldq!c|nq~HLB zN4gD#BAyFh6Ce<;C9*qQNx<6Ok$W@|Kmr6RB?IRji7$8!gYmE=gf|3of+-G7=K&ZA z_}a|~Kn_)%zXEgy{NLGM$f!H{YU)+%)eilPvu9m1jJea}laIH^*Hy7x_+cy-7GssQ!%o*5DO-6yZK$27T@80)n?E$U2_G{wqy zR}Vk7>NzlrAbE|+{K3@|WL4GYaRbDjg{zW6JHjqUbvV1EWcPj0j4lf(TMUE0p~qM+ z%G~#{8C|pLc)hXN+kx|(k!;q)nEiCx`STS4=?gaMkoI$)M@ZNzaf50=e7P|{%D8M~ z>R^fXm<$A3;px>3v13!i!nTl?el)yjF#J5C<)hfXPKPxcujSINn6`$LsR2Dtgsv34 zL2uri%MqEI7ZkJKpY8=Y^sm>NEzr0fy*fQGp_=;6e1@ExrvM@z7_^Z`; zMxRc(2*eD)hezPd0{YC|HtCM3vr@ZmgtX<4BZ1~hwArqVXORuU7vj1fvlYv5_PB= z2QCV#qWHnruDx-^fOk8qRA$4+Y(W`I^iC))nSH0BJg_+3M)T%o)d6Dm<1%eY5=3Ys zn7QMliF&wKan|NS^q9*fg7zCN;96^*u7`W1x3i(nd3c}`2?%t$2JMy?q)gq;h5r0> zyY-vbR<(QD=++GZ;5W83$ZEeggIGlH@l&~qr5?olG zu|P^KA(Mb54NvT)98E}o+y7G4-A)C-fJXqhPog=Wf8AMb!3UM>q94i0sMCWE6Q zdBbV4oKgZ0P)fL-C6{xA2jrNg>7J_fg28INcB>_m*1=$;b@%>p5+;E}01|xzIj~J@ zejkbg>Z9+}s12TFUFfC6*fP`uBsJ|SyYbN{1FjxCY9P=Q9Vd+)L!;aogr~|G1_HRQ zv9Z8NoR`sS%bmpqmS>C9NQE5i@69`V!&^O)T3!-4T+B%Cou^z_q~z~ODM3<8(!iK* z9vWC0!v!NSb}wFs@dZ<9lD=jDn*=kM+1Hg)dqN7%TcefpPPX5i1Po_UJ)oxR5x~*h z%yQFAbqM6|5zS@U>)2ZHG%~E=>X=)uHuBkV(y|;dv#RICt&OTN5gw^--9t+=w=(UU zaHsWqhui!3Wl8$bku96}?HqtQ{KhI%2&yhz+!hI?f>|gVP08hyf)a;A^fE}wU>(UV z)v!${1h8o@>4BylSiLik_~@88aPY<{+6_sa0TcZ@G{ceVJTR_&R7Se^Rg^+NGkiD_ zX_vOBJGC|w_EIFOI95HvSGtoex$-^yJ&zfN#4G_dR=Sq647S>i1Q;SN^uU)KCbgg; zwigZE%9FY$!a8?dwV|~{!H#xKJS>3owMd;MLhqa@-Aea3$}YZ6?^9e}^VhGzCDM+*(N#;~%KB8E8!=QtK|xs5vDfNyE5U+S zTLKN>09~;wG|$TBB=BanJ4eq9Je)0X_dmGw^#+&(iYe+;8! dVaeWSvyjS_V>c$+2y=hKSZud3%Qx{l^iP*4<0=3E literal 3116 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 To~(&a1mNT5Yj6c-|w8? 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 BFMt35 literal 20965 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 diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png index 30b35699795b8424324af41cf2d16f618b6cf1ec..2bc100a9d6a8c9e065af67bea3a89c626a4bdf4f 100644 GIT binary patch delta 4262 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 g(A)o{&?C5^9VCAtuMr)Q02^!20^AU0RR91 literal 19318 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 V!(mA~MN9y?EKO}pF06L{{oex`h5rBm diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png index 32c9e1b4aa760b1917e22b6de5d232859fb283b5..151b1081b5786a2204ccf4db27f8e5f826a46228 100644 GIT binary patch delta 4078 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 literal 19242 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 From 64f60150dfd15a65ffc2a916f7c09ed59e74e43a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 18 May 2016 16:09:35 -0400 Subject: [PATCH 02/15] Colored glow panels, in block form at least! Now to get them to render in item form... --- .../render/obj/MekanismSmartOBJModel.java | 180 ++++++++++++++++-- .../common/multipart/GlowPanelBlockState.java | 41 +++- .../common/multipart/PartGlowPanel.java | 23 ++- 3 files changed, 227 insertions(+), 17 deletions(-) diff --git a/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java index 36581dd9e..1ba7bc4f0 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java @@ -1,36 +1,58 @@ package mekanism.client.render.obj; import java.lang.reflect.Field; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Set; +import mcmultipart.client.multipart.ISmartMultipartModel; import mekanism.api.EnumColor; import mekanism.common.multipart.GlowPanelBlockState; import mekanism.common.multipart.PartGlowPanel; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.IModelPart; import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.obj.OBJModel.Face; import net.minecraftforge.client.model.obj.OBJModel.Group; +import net.minecraftforge.client.model.obj.OBJModel.Normal; import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.client.model.obj.OBJModel.OBJState; +import net.minecraftforge.client.model.obj.OBJModel.TextureCoordinate; +import net.minecraftforge.client.model.obj.OBJModel.Vertex; +import net.minecraftforge.client.model.pipeline.LightUtil; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.common.property.IExtendedBlockState; import codechicken.lib.vec.Matrix4; +import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; -public class MekanismSmartOBJModel extends OBJBakedModel +public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultipartModel { private IBakedModel baseModel; private HashMap transformationMap = new HashMap(); - private static Map glowPanelCache = new HashMap(); + private static Map glowPanelCache = new HashMap(); + private Set bakedQuads; private IBlockState tempState; + private TextureAtlasSprite tempSprite; public MekanismSmartOBJModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { @@ -40,36 +62,170 @@ public class MekanismSmartOBJModel extends OBJBakedModel } @Override - public OBJBakedModel handleBlockState(IBlockState state) + public OBJBakedModel handlePartState(IBlockState state) { - if(state instanceof GlowPanelBlockState) + if(isGlowPanel(state)) { - EnumColor color = state.getValue(PartGlowPanel.colorProperty); + int hash = PartGlowPanel.hash((IExtendedBlockState)state); + EnumColor color = ((IExtendedBlockState)state).getValue(GlowPanelBlockState.colorState).color; - if(!glowPanelCache.containsKey(color)) + if(!glowPanelCache.containsKey(hash)) { MekanismSmartOBJModel model = new MekanismSmartOBJModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap); model.tempState = state; - glowPanelCache.put(color, model); + glowPanelCache.put(hash, model); } - return glowPanelCache.get(color); + return glowPanelCache.get(hash); } return this; } + public boolean isGlowPanel(IBlockState state) + { + return state instanceof IExtendedBlockState && ((IExtendedBlockState)state).getUnlistedProperties().containsKey(GlowPanelBlockState.colorState); + } + @Override public List getGeneralQuads() { - for(Map.Entry g : getModel().getMatLib().getGroups().entrySet()) + if(bakedQuads == null) { - System.out.println("BAKED " + g.getKey() + " " + g.getValue().getName() + " " + g.getValue().getFaces()); + bakedQuads = Collections.synchronizedSet(new LinkedHashSet()); + Set faces = Collections.synchronizedSet(new LinkedHashSet()); + Optional transform = Optional.absent(); + Set coloredFaces = new HashSet(); + + for(Group g : this.getModel().getMatLib().getGroups().values()) + { + if(getState() instanceof OBJState) + { + OBJState state = (OBJState) this.getState(); + + if(state.parent != null) + { + transform = state.parent.apply(Optional. absent()); + } + + if(state.getGroupsWithVisibility(true).contains(g.getName())) + { + faces.addAll(g.applyTransform(transform)); + } + } + else { + transform = getState().apply(Optional. absent()); + LinkedHashSet tempFaces = g.applyTransform(transform); + faces.addAll(tempFaces); + + if(isGlowPanel(tempState) && g.getName().equals("light")) + { + coloredFaces.addAll(tempFaces); + } + } + } + + for(Face f : faces) + { + if(getModel().getMatLib().getMaterial(f.getMaterialName()).isWhite()) + { + for(Vertex v : f.getVertices()) + { + if(!v.getMaterial().equals(this.getModel().getMatLib().getMaterial(v.getMaterial().getName()))) + { + v.setMaterial(this.getModel().getMatLib().getMaterial(v.getMaterial().getName())); + } + } + + tempSprite = ModelLoader.White.instance; + } + else { + tempSprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(this.getModel().getMatLib().getMaterial(f.getMaterialName()).getTexture().getTextureLocation().toString()); + } + + float[] color = new float[] { 1, 1, 1, 1 }; + + if(coloredFaces.contains(f)) + { + EnumColor c = ((IExtendedBlockState) tempState).getValue(GlowPanelBlockState.colorState).color; + color = new float[] {c.getColor(0), c.getColor(1), c.getColor(2), 1}; + } + + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(getFormat()); + builder.setQuadOrientation(EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z)); + builder.setQuadColored(); + builder.setQuadTint(0); + + Normal faceNormal = f.getNormal(); + putVertexData(builder, f.getVertices()[0], faceNormal, TextureCoordinate.getDefaultUVs()[0], tempSprite, color); + putVertexData(builder, f.getVertices()[1], faceNormal, TextureCoordinate.getDefaultUVs()[1], tempSprite, color); + putVertexData(builder, f.getVertices()[2], faceNormal, TextureCoordinate.getDefaultUVs()[2], tempSprite, color); + putVertexData(builder, f.getVertices()[3], faceNormal, TextureCoordinate.getDefaultUVs()[3], tempSprite, color); + + bakedQuads.add(builder.build()); + } } + + List quadList = Collections.synchronizedList(Lists.newArrayList(bakedQuads)); - return super.getGeneralQuads(); + return quadList; } - + + private final void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, float[] color) + { + for(int e = 0; e < getFormat().getElementCount(); e++) + { + switch(getFormat().getElement(e).getUsage()) + { + case POSITION: + builder.put(e, v.getPos().x, v.getPos().y, v.getPos().z, v.getPos().w); + break; + case COLOR: + float d; + + if(v.hasNormal()) + { + d = LightUtil.diffuseLight(v.getNormal().x, v.getNormal().y, v.getNormal().z); + } + else { + d = LightUtil.diffuseLight(faceNormal.x, faceNormal.y, faceNormal.z); + } + + if(v.getMaterial() != null) + { + builder.put(e, d * v.getMaterial().getColor().x * color[0], d * v.getMaterial().getColor().y * color[1], d * v.getMaterial().getColor().z * color[2], v.getMaterial().getColor().w * color[3]); + } + else { + builder.put(e, d, d, d, 1); + } + + break; + case UV: + if(!v.hasTextureCoordinate()) + { + builder.put(e, sprite.getInterpolatedU(defUV.u * 16), sprite.getInterpolatedV((1 - defUV.v) * 16), 0, 1); + } + else { + builder.put(e, sprite.getInterpolatedU(v.getTextureCoordinate().u * 16), sprite.getInterpolatedV((1 - v.getTextureCoordinate().v) * 16), 0, 1); + } + + break; + case NORMAL: + if(!v.hasNormal()) + { + builder.put(e, faceNormal.x, faceNormal.y, faceNormal.z, 0); + } + else { + builder.put(e, v.getNormal().x, v.getNormal().y, v.getNormal().z, 0); + } + + break; + default: + builder.put(e); + } + } + } + private static Field f_textures; public static ImmutableMap getTexturesForOBJModel(IBakedModel model) diff --git a/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java b/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java index ad5f6128e..906060f55 100644 --- a/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java +++ b/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java @@ -1,6 +1,7 @@ package mekanism.common.multipart; import mcmultipart.MCMultiPartMod; +import mekanism.api.EnumColor; import mekanism.common.block.states.BlockStateFacing; import net.minecraft.block.properties.IProperty; import net.minecraftforge.common.property.ExtendedBlockState; @@ -8,8 +9,46 @@ import net.minecraftforge.common.property.IUnlistedProperty; public class GlowPanelBlockState extends ExtendedBlockState { + public static GlowPanelColorProperty colorState = new GlowPanelColorProperty(); + public GlowPanelBlockState() { - super(MCMultiPartMod.multipart, new IProperty[] {BlockStateFacing.facingProperty, PartGlowPanel.colorProperty}, new IUnlistedProperty[] {}); + super(MCMultiPartMod.multipart, new IProperty[] {BlockStateFacing.facingProperty}, new IUnlistedProperty[] {colorState}); + } + + public static class GlowPanelColorProperty implements IUnlistedProperty + { + public EnumColor color; + + public GlowPanelColorProperty() {} + + public GlowPanelColorProperty(EnumColor c) + { + color = c; + } + + @Override + public String getName() + { + return "color"; + } + + @Override + public boolean isValid(GlowPanelColorProperty value) + { + return true; + } + + @Override + public Class getType() + { + return getClass(); + } + + @Override + public String valueToString(GlowPanelColorProperty value) + { + return color.getName(); + } } } diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 73bdd0e3d..0789a181d 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -14,7 +14,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateFacing; -import net.minecraft.block.properties.PropertyEnum; +import mekanism.common.multipart.GlowPanelBlockState.GlowPanelColorProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -25,6 +25,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.Vec3; +import net.minecraftforge.common.property.IExtendedBlockState; /* import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; @@ -44,8 +45,6 @@ import codechicken.multipart.TileMultipart; public class PartGlowPanel extends Multipart implements IOccludingPart { - public static PropertyEnum colorProperty = PropertyEnum.create("color", EnumColor.class); - public EnumColor colour = EnumColor.WHITE; public EnumFacing side = EnumFacing.DOWN; @@ -189,6 +188,22 @@ public class PartGlowPanel extends Multipart implements IOccludingPart @Override public IBlockState getExtendedState(IBlockState state) { - return state.withProperty(BlockStateFacing.facingProperty, side).withProperty(colorProperty, colour); + state = state.withProperty(BlockStateFacing.facingProperty, side); + + if(state instanceof IExtendedBlockState) + { + return ((IExtendedBlockState)state).withProperty(GlowPanelBlockState.colorState, new GlowPanelColorProperty(colour)); + } + + return state; + } + + public static int hash(IExtendedBlockState state) + { + int hash = 1; + hash = 31 * hash + state.getValue(GlowPanelBlockState.colorState).color.ordinal(); + hash = 31 * hash + state.getValue(BlockStateFacing.facingProperty).ordinal(); + + return hash; } } From c002ac6d8a526b4443b1b1e7decc1e4af71fb30d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 18 May 2016 19:06:36 -0400 Subject: [PATCH 03/15] Glow Panels render in item form, use getEffectiveSide() instead of isRemote when checking packet security --- .../java/mekanism/client/ClientProxy.java | 4 +- .../ctm/{ChiselFace.java => CTMFace.java} | 26 ++-- .../client/render/ctm/CTMModelFactory.java | 4 +- .../client/render/ctm/CTMRegistry.java | 6 +- .../mekanism/client/render/ctm/ModelCTM.java | 8 +- ...{ChiselTextureCTM.java => TextureCTM.java} | 4 +- ...SmartOBJModel.java => GlowPanelModel.java} | 137 ++++++++++++++---- .../client/render/obj/MekanismOBJLoader.java | 86 ++++++++++- .../client/render/obj/MekanismOBJModel.java | 19 ++- .../TileEntityInternalMultiblock.java | 3 +- .../common/multipart/ItemGlowPanel.java | 57 ++------ .../common/multipart/MultipartMekanism.java | 13 ++ .../common/multipart/PartGlowPanel.java | 5 +- .../TileEntityAdvancedElectricMachine.java | 3 +- .../tile/TileEntityAmbientAccumulator.java | 3 +- .../common/tile/TileEntityBasicBlock.java | 3 +- .../common/tile/TileEntityBasicMachine.java | 3 +- .../mekanism/common/tile/TileEntityBin.java | 3 +- .../common/tile/TileEntityBoilerCasing.java | 3 +- .../common/tile/TileEntityChargepad.java | 3 +- .../tile/TileEntityChemicalCrystallizer.java | 3 +- .../TileEntityChemicalDissolutionChamber.java | 3 +- .../tile/TileEntityChemicalInfuser.java | 3 +- .../tile/TileEntityChemicalOxidizer.java | 3 +- .../common/tile/TileEntityChemicalWasher.java | 3 +- .../common/tile/TileEntityDigitalMiner.java | 5 +- .../common/tile/TileEntityDynamicTank.java | 3 +- .../common/tile/TileEntityElectricBlock.java | 3 +- .../common/tile/TileEntityElectricPump.java | 3 +- .../tile/TileEntityElectrolyticSeparator.java | 5 +- .../common/tile/TileEntityEnergyCube.java | 3 +- .../common/tile/TileEntityFactory.java | 5 +- .../common/tile/TileEntityFluidTank.java | 3 +- .../tile/TileEntityFluidicPlenisher.java | 3 +- .../TileEntityFormulaicAssemblicator.java | 5 +- .../common/tile/TileEntityFuelwoodHeater.java | 3 +- .../common/tile/TileEntityGasTank.java | 5 +- .../tile/TileEntityInductionCasing.java | 3 +- .../common/tile/TileEntityInductionCell.java | 3 +- .../common/tile/TileEntityInductionPort.java | 3 +- .../tile/TileEntityInductionProvider.java | 3 +- .../mekanism/common/tile/TileEntityLaser.java | 3 +- .../common/tile/TileEntityLaserAmplifier.java | 5 +- .../tile/TileEntityLaserTractorBeam.java | 3 +- .../tile/TileEntityLogisticalSorter.java | 5 +- .../tile/TileEntityMetallurgicInfuser.java | 5 +- .../common/tile/TileEntityMultiblock.java | 3 +- .../tile/TileEntityOredictionificator.java | 3 +- .../mekanism/common/tile/TileEntityPRC.java | 3 +- .../tile/TileEntityQuantumEntangloporter.java | 5 +- .../tile/TileEntityResistiveHeater.java | 5 +- .../tile/TileEntityRotaryCondensentrator.java | 5 +- .../common/tile/TileEntitySecurityDesk.java | 5 +- .../tile/TileEntitySeismicVibrator.java | 3 +- .../tile/TileEntitySolarNeutronActivator.java | 3 +- .../common/tile/TileEntityTeleporter.java | 4 +- ...ileEntityThermalEvaporationController.java | 3 +- .../common/tile/TileEntityBioGenerator.java | 3 +- .../common/tile/TileEntityGasGenerator.java | 3 +- .../common/tile/TileEntityGenerator.java | 3 +- .../common/tile/TileEntityHeatGenerator.java | 3 +- .../common/tile/TileEntitySolarGenerator.java | 3 +- .../reactor/TileEntityReactorController.java | 5 +- .../TileEntityReactorLogicAdapter.java | 5 +- .../tile/turbine/TileEntityTurbineCasing.java | 3 +- .../tile/turbine/TileEntityTurbineRotor.java | 3 +- .../mekanism/models/item/glow_panel.json | 3 + 67 files changed, 394 insertions(+), 169 deletions(-) rename src/main/java/mekanism/client/render/ctm/{ChiselFace.java => CTMFace.java} (65%) rename src/main/java/mekanism/client/render/ctm/{ChiselTextureCTM.java => TextureCTM.java} (94%) rename src/main/java/mekanism/client/render/obj/{MekanismSmartOBJModel.java => GlowPanelModel.java} (61%) create mode 100644 src/main/resources/assets/mekanism/models/item/glow_panel.json diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 7f8d26598..6c0fcf385 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -376,6 +376,7 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.GaugeDropper); registerItemRender(MekanismItems.FactoryInstaller); registerItemRender(MekanismItems.OtherDust); + registerItemRender(MekanismItems.GlowPanel); ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF_MODEL); @@ -855,10 +856,11 @@ public class ClientProxy extends CommonProxy { MekanismRenderer.init(); - ModelLoaderRegistry.registerLoader(new MekanismOBJLoader()); + ModelLoaderRegistry.registerLoader(MekanismOBJLoader.INSTANCE); MinecraftForge.EVENT_BUS.register(new CTMRegistry()); MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(MekanismOBJLoader.INSTANCE); //Register entity rendering handlers RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory() { diff --git a/src/main/java/mekanism/client/render/ctm/ChiselFace.java b/src/main/java/mekanism/client/render/ctm/CTMFace.java similarity index 65% rename from src/main/java/mekanism/client/render/ctm/ChiselFace.java rename to src/main/java/mekanism/client/render/ctm/CTMFace.java index c0f88a684..baf7bfe0e 100644 --- a/src/main/java/mekanism/client/render/ctm/ChiselFace.java +++ b/src/main/java/mekanism/client/render/ctm/CTMFace.java @@ -9,50 +9,50 @@ import net.minecraft.util.EnumWorldBlockLayer; /** * Chisel Face, basically a list of IChiselTexture's */ -public final class ChiselFace { +public final class CTMFace { - private List textureList; + private List textureList; - private List childFaces; + private List childFaces; private EnumWorldBlockLayer layer; - public ChiselFace() { + public CTMFace() { this(new ArrayList<>(), new ArrayList<>()); } - public ChiselFace(EnumWorldBlockLayer layer) { + public CTMFace(EnumWorldBlockLayer layer) { this(); setLayer(layer); } - public ChiselFace(List textureList, List childFaces) { + public CTMFace(List textureList, List childFaces) { this.textureList = textureList; this.childFaces = childFaces; } - public List getTextureList(){ - List list = new ArrayList<>(); + public List getTextureList(){ + List list = new ArrayList<>(); list.addAll(this.textureList); - for (ChiselFace face : childFaces){ + for (CTMFace face : childFaces){ list.addAll(face.getTextureList()); } return list; } - public void addTexture(ChiselTextureCTM texture){ + public void addTexture(TextureCTM texture){ this.textureList.add(texture); } - public void addChildFace(ChiselFace face){ + public void addChildFace(CTMFace face){ this.childFaces.add(face); } - public boolean removeTexture(ChiselTextureCTM texture){ + public boolean removeTexture(TextureCTM texture){ return this.textureList.remove(texture); } - public boolean removeChildFace(ChiselFace face){ + public boolean removeChildFace(CTMFace face){ return this.childFaces.remove(face); } diff --git a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java index dbd9e0a2b..f37f696f4 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java +++ b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java @@ -131,7 +131,7 @@ public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPers for(EnumFacing facing : EnumFacing.VALUES) { - ChiselTextureCTM face = model.getFace(facing); + TextureCTM face = model.getFace(facing); ICTMBlock block = (ICTMBlock)state.getBlock(); CTMData data = block.getCTMData(state); @@ -151,7 +151,7 @@ public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPers return new CTMModelFactory(faceQuads, generalQuads, model); } - private void addAllQuads(List from, ChiselTextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List to) + private void addAllQuads(List from, TextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List to) { for(BakedQuad q : from) { diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index ba193fce4..0c79ab459 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -30,7 +30,7 @@ public class CTMRegistry public static List> ctmTypes = new ArrayList>(); - public static Map textureCache = new HashMap(); + public static Map textureCache = new HashMap(); @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre event) @@ -69,7 +69,7 @@ public class CTMRegistry textures.add(callback); } - public static ChiselTextureCTM createTexture(String domain, String name) + public static TextureCTM createTexture(String domain, String name) { TextureSpriteCallback[] callbacks = new TextureSpriteCallback[CTM.REQUIRED_TEXTURES]; @@ -79,6 +79,6 @@ public class CTMRegistry register(callbacks[0]); register(callbacks[1]); - return new ChiselTextureCTM(EnumWorldBlockLayer.SOLID, callbacks); + return new TextureCTM(EnumWorldBlockLayer.SOLID, callbacks); } } diff --git a/src/main/java/mekanism/client/render/ctm/ModelCTM.java b/src/main/java/mekanism/client/render/ctm/ModelCTM.java index 701b9fec6..d4891dccb 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelCTM.java +++ b/src/main/java/mekanism/client/render/ctm/ModelCTM.java @@ -26,8 +26,8 @@ public class ModelCTM implements IModel { private Map overrides = Maps.newHashMap(); - private transient ChiselTextureCTM faceObj; - private transient Map overridesObj = new EnumMap<>(EnumFacing.class); + private transient TextureCTM faceObj; + private transient Map overridesObj = new EnumMap<>(EnumFacing.class); private transient IBakedModel modelObj; @@ -77,12 +77,12 @@ public class ModelCTM implements IModel overridesObj.values().forEach(t -> textures.addAll(t.getTextures())); } - public ChiselTextureCTM getDefaultFace() + public TextureCTM getDefaultFace() { return faceObj; } - public ChiselTextureCTM getFace(EnumFacing facing) + public TextureCTM getFace(EnumFacing facing) { return overridesObj.getOrDefault(facing, faceObj); } diff --git a/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java b/src/main/java/mekanism/client/render/ctm/TextureCTM.java similarity index 94% rename from src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java rename to src/main/java/mekanism/client/render/ctm/TextureCTM.java index e86ac1cf3..fb1027141 100644 --- a/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java +++ b/src/main/java/mekanism/client/render/ctm/TextureCTM.java @@ -13,13 +13,13 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.ResourceLocation; -public class ChiselTextureCTM +public class TextureCTM { protected EnumWorldBlockLayer layer; public TextureSpriteCallback[] sprites; - public ChiselTextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) + public TextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) { this.layer = layer; this.sprites = sprites; diff --git a/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java similarity index 61% rename from src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java rename to src/main/java/mekanism/client/render/obj/GlowPanelModel.java index 1ba7bc4f0..e46b80d6f 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -9,20 +9,28 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.vecmath.Matrix4f; + import mcmultipart.client.multipart.ISmartMultipartModel; import mekanism.api.EnumColor; +import mekanism.client.render.ctm.CTMModelFactory; import mekanism.common.multipart.GlowPanelBlockState; import mekanism.common.multipart.PartGlowPanel; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.IModelPart; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJModel; @@ -36,55 +44,96 @@ import net.minecraftforge.client.model.obj.OBJModel.Vertex; import net.minecraftforge.client.model.pipeline.LightUtil; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.common.property.IExtendedBlockState; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + import codechicken.lib.vec.Matrix4; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultipartModel +public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartModel { private IBakedModel baseModel; private HashMap transformationMap = new HashMap(); - private static Map glowPanelCache = new HashMap(); + private static Map glowPanelCache = new HashMap(); + private static Map glowPanelItemCache = new HashMap(); private Set bakedQuads; private IBlockState tempState; private TextureAtlasSprite tempSprite; + private ItemStack tempStack; - public MekanismSmartOBJModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) + public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { model.super(model, state, format, textures); baseModel = base; transformationMap = transform; } + public EnumColor getColor() + { + if(tempStack != null) + { + return EnumColor.DYES[tempStack.getItemDamage()]; + } + + if(tempState != null) + { + return ((IExtendedBlockState)tempState).getValue(GlowPanelBlockState.colorState).color; + } + + return EnumColor.WHITE; + } + @Override public OBJBakedModel handlePartState(IBlockState state) { - if(isGlowPanel(state)) + int hash = PartGlowPanel.hash((IExtendedBlockState)state); + EnumColor color = ((IExtendedBlockState)state).getValue(GlowPanelBlockState.colorState).color; + + if(!glowPanelCache.containsKey(hash)) { - int hash = PartGlowPanel.hash((IExtendedBlockState)state); - EnumColor color = ((IExtendedBlockState)state).getValue(GlowPanelBlockState.colorState).color; - - if(!glowPanelCache.containsKey(hash)) - { - MekanismSmartOBJModel model = new MekanismSmartOBJModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap); - model.tempState = state; - glowPanelCache.put(hash, model); - } - - return glowPanelCache.get(hash); + GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap); + model.tempState = state; + glowPanelCache.put(hash, model); } - return this; + return glowPanelCache.get(hash); } - public boolean isGlowPanel(IBlockState state) + @Override + public IBakedModel handleItemState(ItemStack stack) { - return state instanceof IExtendedBlockState && ((IExtendedBlockState)state).getUnlistedProperties().containsKey(GlowPanelBlockState.colorState); + if(glowPanelItemCache.containsKey(stack.getItemDamage())) + return glowPanelItemCache.get(stack.getItemDamage()); + + ImmutableMap.Builder builder = ImmutableMap.builder(); + builder.put(ModelLoader.White.loc.toString(), ModelLoader.White.instance); + TextureAtlasSprite missing = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(new ResourceLocation("missingno").toString()); + + for(String s : getModel().getMatLib().getMaterialNames()) + { + TextureAtlasSprite sprite = null; + + if(sprite==null) + sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getModel().getMatLib().getMaterial(s).getTexture().getTextureLocation().toString()); + if(sprite==null) + sprite = missing; + + builder.put(s, sprite); + } + + builder.put("missingno", missing); + GlowPanelModel bakedModel = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), builder.build(), transformationMap); + bakedModel.tempStack = stack; + glowPanelItemCache.put(stack.getItemDamage(), bakedModel); + + return bakedModel; } @Override @@ -97,28 +146,34 @@ public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultip Optional transform = Optional.absent(); Set coloredFaces = new HashSet(); - for(Group g : this.getModel().getMatLib().getGroups().values()) + for(Group g : getModel().getMatLib().getGroups().values()) { if(getState() instanceof OBJState) { - OBJState state = (OBJState) this.getState(); + OBJState state = (OBJState)getState(); if(state.parent != null) { - transform = state.parent.apply(Optional. absent()); + transform = state.parent.apply(Optional.absent()); } if(state.getGroupsWithVisibility(true).contains(g.getName())) { - faces.addAll(g.applyTransform(transform)); + LinkedHashSet tempFaces = g.applyTransform(transform); + faces.addAll(tempFaces); + + if(g.getName().equals("light")) + { + coloredFaces.addAll(tempFaces); + } } } else { - transform = getState().apply(Optional. absent()); + transform = getState().apply(Optional.absent()); LinkedHashSet tempFaces = g.applyTransform(transform); faces.addAll(tempFaces); - if(isGlowPanel(tempState) && g.getName().equals("light")) + if(g.getName().equals("light")) { coloredFaces.addAll(tempFaces); } @@ -147,7 +202,7 @@ public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultip if(coloredFaces.contains(f)) { - EnumColor c = ((IExtendedBlockState) tempState).getValue(GlowPanelBlockState.colorState).color; + EnumColor c = getColor(); color = new float[] {c.getColor(0), c.getColor(1), c.getColor(2), 1}; } @@ -249,4 +304,34 @@ public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultip { return getTexturesForOBJModel(this); } + + private Pair thirdPersonTransform; + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + { + if(cameraTransformType == TransformType.GUI) + { + GlStateManager.translate(0.3F, 0.25F, 0.0F); + GlStateManager.rotate(90, 1, 0, 0); + GlStateManager.scale(1.6F, 1.6F, 1.6F); + } + else if(cameraTransformType == TransformType.FIRST_PERSON) + { + GlStateManager.translate(0.0F, 0.3F, 0.0F); + } + else if(cameraTransformType == TransformType.THIRD_PERSON) + { + GlStateManager.translate(0.0F, -0.1F, 0.0F); + + if(thirdPersonTransform == null) + { + thirdPersonTransform = ImmutablePair.of(this, CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); + } + + return thirdPersonTransform; + } + + return Pair.of(this, null); + } } diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index f48eb683e..1e86e13c4 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -4,16 +4,95 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import mekanism.client.render.obj.MekanismOBJModel.OBJModelType; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import codechicken.lib.vec.Matrix4; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; public class MekanismOBJLoader extends OBJLoader { + public static final MekanismOBJLoader INSTANCE = new MekanismOBJLoader(); + private final Map modelCache = new HashMap(); + private static final ImmutableMap flipData = ImmutableMap.of("flip-v", String.valueOf(true)); + + public static final String[] OBJ_RENDERS = new String[] {"glow_panel"}; + + @SubscribeEvent + public void onModelBake(ModelBakeEvent event) throws IOException + { + for(String s : OBJ_RENDERS) + { + ModelResourceLocation model = new ModelResourceLocation("mekanism:" + s, "inventory"); + Object obj = event.modelRegistry.getObject(model); + + if(obj instanceof IBakedModel) + { + event.modelRegistry.putObject(model, createBakedObjItemModel((IBakedModel)obj, "mekanism:models/block/" + s + ".obj.mek", new OBJModel.OBJState(Lists.newArrayList(OBJModel.Group.ALL), true), DefaultVertexFormats.ITEM)); + } + } + } + + public OBJBakedModel createBakedObjItemModel(IBakedModel existingModel, String name, IModelState state, VertexFormat format) + { + try { + Function textureGetter = new Function() { + public TextureAtlasSprite apply(ResourceLocation location) + { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); + } + }; + + ResourceLocation modelLocation = new ResourceLocation(name); + OBJModel objModel = (OBJModel)OBJLoader.instance.loadModel(modelLocation); + objModel = (OBJModel)objModel.process(flipData); + ImmutableMap.Builder builder = ImmutableMap.builder(); + builder.put(ModelLoader.White.loc.toString(), ModelLoader.White.instance); + TextureAtlasSprite missing = textureGetter.apply(new ResourceLocation("missingno")); + + for(String s : objModel.getMatLib().getMaterialNames()) + { + if(objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getResourcePath().startsWith("#")) + { + FMLLog.severe("OBJLoader: Unresolved texture '%s' for obj model '%s'", objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getResourcePath(), modelLocation); + builder.put(s, missing); + } + else { + builder.put(s, textureGetter.apply(objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation())); + } + } + + builder.put("missingno", missing); + + return new GlowPanelModel(existingModel, objModel, state, format, builder.build(), new HashMap()); + } catch(Exception e) { + e.printStackTrace(); + } + + return null; + } + @Override public boolean accepts(ResourceLocation modelLocation) { @@ -29,8 +108,11 @@ public class MekanismOBJLoader extends OBJLoader if(model instanceof OBJModel) { - MekanismOBJModel mekModel = new MekanismOBJModel(((OBJModel)model).getMatLib(), loc); - modelCache.put(loc, mekModel); + if(loc.getResourcePath().contains("glow_panel")) + { + MekanismOBJModel mekModel = new MekanismOBJModel(OBJModelType.GLOW_PANEL, ((OBJModel)model).getMatLib(), loc); + modelCache.put(loc, mekModel); + } } } diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java index 0bf0d8cc7..c3f354130 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java @@ -11,15 +11,30 @@ import com.google.common.base.Function; public class MekanismOBJModel extends OBJModel { - public MekanismOBJModel(MaterialLibrary matLib, ResourceLocation modelLocation) + public OBJModelType modelType; + + public MekanismOBJModel(OBJModelType type, MaterialLibrary matLib, ResourceLocation modelLocation) { super(matLib, modelLocation); + + modelType = type; } @Override public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { IFlexibleBakedModel preBaked = super.bake(state, format, bakedTextureGetter); - return new MekanismSmartOBJModel(preBaked, this, state, format, MekanismSmartOBJModel.getTexturesForOBJModel(preBaked), null); + + if(modelType == OBJModelType.GLOW_PANEL) + { + return new GlowPanelModel(preBaked, this, state, format, GlowPanelModel.getTexturesForOBJModel(preBaked), null); + } + + return null; + } + + public static enum OBJModelType + { + GLOW_PANEL } } diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java index 184031f08..3ef65046d 100644 --- a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import net.minecraftforge.fml.common.FMLCommonHandler; import mekanism.common.PacketHandler; import mekanism.common.tile.TileEntityBasicBlock; @@ -19,7 +20,7 @@ public class TileEntityInternalMultiblock extends TileEntityBasicBlock { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { if(dataStream.readBoolean()) { diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index 986f7ff37..6c3d39108 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -14,6 +14,7 @@ import mcmultipart.item.ItemMultiPart; import mcmultipart.multipart.IMultipart; import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.base.IMetaItem; import mekanism.common.util.LangUtils; //import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,7 +27,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; -public class ItemGlowPanel extends ItemMultiPart +public class ItemGlowPanel extends ItemMultiPart implements IMetaItem { public ItemGlowPanel() { @@ -48,53 +49,11 @@ public class ItemGlowPanel extends ItemMultiPart { return new PartGlowPanel(col, orientation); } - -/* - if(world.getTileEntity(pos.x, pos.y, pos.z) instanceof IMultipartContainer && ((TileMultipart) world.getTileEntity(pos.x, pos.y, pos.z)).partMap(orientation.ordinal()) instanceof HollowMicroblock) - { - return new PartGlowPanel(col, orientation); - } -*/ } return null; } -/* - public EnumFacing getSideFromVector3(Vec3 vector) - { - if(Math.abs(vector.xCoord) > Math.abs(vector.yCoord) && Math.abs(vector.xCoord) > Math.abs(vector.zCoord)) - { - if((vector.xCoord < 0.5 && vector.xCoord > 0) || vector.xCoord == -0.5) - { - return EnumFacing.EAST; - } - - return EnumFacing.WEST; - } - else if(Math.abs(vector.y) > Math.abs(vector.x) && Math.abs(vector.y) > Math.abs(vector.z)) - { - if((vector.y < 0.5 && vector.y > 0) || vector.y == -0.5) - { - return EnumFacing.UP; - } - - return EnumFacing.DOWN; - } - else if(Math.abs(vector.z) > Math.abs(vector.x) && Math.abs(vector.z) > Math.abs(vector.y)) - { - if((vector.z < 0.5 && vector.z > 0) || vector.z == -0.5) - { - return EnumFacing.SOUTH; - } - - return EnumFacing.NORTH; - } - - return null; - } -*/ - @Override public void getSubItems(Item item, CreativeTabs tab, List listToAddTo) { @@ -131,4 +90,16 @@ public class ItemGlowPanel extends ItemMultiPart { return true; } + + @Override + public String getTexture(int meta) + { + return "glow_panel"; + } + + @Override + public int getVariants() + { + return EnumColor.DYES.length; + } } diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 5eb7b12ee..2d87935e7 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -8,7 +8,10 @@ import mcmultipart.multipart.MultipartRegistry; import mekanism.common.MekanismBlocks; import mekanism.common.Tier; import mekanism.common.block.states.BlockStateMachine.MachineType; +import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.fml.common.event.FMLInterModComms; /* import codechicken.microblock.BlockMicroMaterial; @@ -192,4 +195,14 @@ public class MultipartMekanism implements IPartFactory FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.BasicBlock2, 1, 0)); FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.CardboardBox)); } + + public static void dropItem(ItemStack stack, World world, Vec3 pos) + { + EntityItem item = new EntityItem(world, pos.xCoord, pos.yCoord, pos.zCoord, stack); + item.motionX = world.rand.nextGaussian() * 0.05; + item.motionY = world.rand.nextGaussian() * 0.05 + 0.2; + item.motionZ = world.rand.nextGaussian() * 0.05; + item.setDefaultPickupDelay(); + world.spawnEntityInWorld(item); + } } diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 0789a181d..d20016586 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -12,6 +12,7 @@ import mcmultipart.raytrace.PartMOP; import mcmultipart.util.TransformationHelper; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Pos3D; import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.multipart.GlowPanelBlockState.GlowPanelColorProperty; @@ -100,7 +101,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart { if(!getWorld().isRemote && !canStay()) { - //TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), Vector3.fromTileEntityCenter(tile())); + MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), new Pos3D(getPos()).translate(0.5, 0.5, 0.5)); getContainer().removePart(this); } } @@ -110,7 +111,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart { if(!getWorld().isRemote && !canStay()) { - //TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), Vector3.fromTileEntityCenter(tile())); + MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), new Pos3D(getPos()).translate(0.5, 0.5, 0.5)); getContainer().removePart(this); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 83e9f10e5..ce7dea9e0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -32,6 +32,7 @@ import mekanism.common.util.StatUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.FMLCommonHandler; public abstract class TileEntityAdvancedElectricMachine> extends TileEntityBasicMachine implements IGasHandler, ITubeConnection { @@ -314,7 +315,7 @@ public abstract class TileEntityAdvancedElectricMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { @@ -157,7 +158,7 @@ public abstract class TileEntityBasicMachine, { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { operatingTicks = dataStream.readInt(); clientActive = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 96a77d451..9e60f982c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -31,6 +31,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; @@ -294,7 +295,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { isActive = dataStream.readBoolean(); clientAmount = dataStream.readInt(); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 48fe1a34b..f0f274eed 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityBoilerCasing extends TileEntityMultiblock implements IHeatTransfer { @@ -296,7 +297,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock implements IFluidContainerManager { @@ -251,7 +252,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock implements IStrictEnergyStorage, IComputerIntegration { @@ -102,7 +103,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock> extend { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { if(structure == null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 59beede92..f674a77e4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -28,6 +28,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.Constants.NBT; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData, ISecurityTile @@ -224,7 +225,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { int type = dataStream.readInt(); diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index b27204b48..2f2513274 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -41,6 +41,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager { @@ -247,7 +248,7 @@ public class TileEntityPRC extends TileEntityBasicMachine implements IStrictEnergyStorage { @@ -201,7 +202,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock Date: Wed, 18 May 2016 19:33:10 -0400 Subject: [PATCH 04/15] Remove all CCLib dependencies --- .../java/mekanism/client/render/obj/GlowPanelModel.java | 6 ++---- .../java/mekanism/client/render/obj/MekanismOBJLoader.java | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java index e46b80d6f..bcee73c14 100644 --- a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -48,8 +48,6 @@ import net.minecraftforge.common.property.IExtendedBlockState; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import codechicken.lib.vec.Matrix4; - import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -58,7 +56,7 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode { private IBakedModel baseModel; - private HashMap transformationMap = new HashMap(); + private HashMap transformationMap = new HashMap(); private static Map glowPanelCache = new HashMap(); private static Map glowPanelItemCache = new HashMap(); @@ -68,7 +66,7 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode private TextureAtlasSprite tempSprite; private ItemStack tempStack; - public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) + public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { model.super(model, state, format, textures); baseModel = base; diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index 1e86e13c4..3e2682ff1 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -4,6 +4,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.vecmath.Matrix4f; + import mekanism.client.render.obj.MekanismOBJModel.OBJModelType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; @@ -23,7 +25,6 @@ import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import codechicken.lib.vec.Matrix4; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; @@ -85,7 +86,7 @@ public class MekanismOBJLoader extends OBJLoader builder.put("missingno", missing); - return new GlowPanelModel(existingModel, objModel, state, format, builder.build(), new HashMap()); + return new GlowPanelModel(existingModel, objModel, state, format, builder.build(), new HashMap()); } catch(Exception e) { e.printStackTrace(); } From 9af9adb56df6b8dfff95cd29500744d712884e97 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 18 May 2016 20:31:49 -0400 Subject: [PATCH 05/15] Use getGeneralQuads() instead of handlePerspective() to fix lighting issues --- .../render/item/BakedCustomItemModel.java | 44 +++++++++++++------ .../render/item/BakedGeneratorItemModel.java | 38 +++++++++++----- 2 files changed, 57 insertions(+), 25 deletions(-) diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 8bf2c2f58..0aa94a283 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -51,12 +51,15 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; @@ -75,6 +78,8 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel private IBakedModel baseModel; private ItemStack stack; + private TransformType prevTransform; + private Minecraft mc = Minecraft.getMinecraft(); private static final RenderFluidTank fluidTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class); @@ -393,11 +398,33 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel @Override public List getGeneralQuads() { + Tessellator tessellator = Tessellator.getInstance(); + tessellator.draw(); + List generalQuads = new LinkedList(); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.5F, 0.5F, 0.5F); + doRender(prevTransform); + GlStateManager.enableLighting(); + GlStateManager.enableLight(0); + GlStateManager.enableLight(1); + GlStateManager.enableColorMaterial(); + GlStateManager.colorMaterial(1032, 5634); + Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.popMatrix(); + + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.begin(7, DefaultVertexFormats.ITEM); + if(Block.getBlockFromItem(stack.getItem()) != null) { - generalQuads.addAll(baseModel.getGeneralQuads()); + MachineType machineType = MachineType.get(stack); + + if(machineType != MachineType.DIGITAL_MINER) + { + generalQuads.addAll(baseModel.getGeneralQuads()); + } } return generalQuads; @@ -441,22 +468,13 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) - { + { + prevTransform = cameraTransformType; + if(cameraTransformType == TransformType.THIRD_PERSON) { ForgeHooksClient.multiplyCurrentGlMatrix(CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); } - - GlStateManager.pushMatrix(); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - doRender(cameraTransformType); - GlStateManager.scale(2.0F, 2.0F, 2.0F); - GlStateManager.enableLighting(); - GlStateManager.enableLight(0); - GlStateManager.enableLight(1); - GlStateManager.enableColorMaterial(); - GlStateManager.colorMaterial(1032, 5634); - GlStateManager.popMatrix(); return Pair.of(this, null); } diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java index eba301bfb..7e9e61894 100644 --- a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -18,10 +18,14 @@ import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; @@ -39,6 +43,8 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo private IBakedModel baseModel; private ItemStack stack; + private TransformType prevTransform; + private Minecraft mc = Minecraft.getMinecraft(); public static ModelAdvancedSolarGenerator advancedSolarGenerator = new ModelAdvancedSolarGenerator(); @@ -123,8 +129,25 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo @Override public List getGeneralQuads() { + Tessellator tessellator = Tessellator.getInstance(); + tessellator.draw(); + List generalQuads = new LinkedList(); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.5F, 0.5F, 0.5F); + doRender(prevTransform); + GlStateManager.enableLighting(); + GlStateManager.enableLight(0); + GlStateManager.enableLight(1); + GlStateManager.enableColorMaterial(); + GlStateManager.colorMaterial(1032, 5634); + Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.popMatrix(); + + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.begin(7, DefaultVertexFormats.ITEM); + if(Block.getBlockFromItem(stack.getItem()) != null) { generalQuads.addAll(baseModel.getGeneralQuads()); @@ -171,22 +194,13 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) - { + { + prevTransform = cameraTransformType; + if(cameraTransformType == TransformType.THIRD_PERSON) { ForgeHooksClient.multiplyCurrentGlMatrix(CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); } - - GlStateManager.pushMatrix(); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - doRender(cameraTransformType); - GlStateManager.scale(2.0F, 2.0F, 2.0F); - GlStateManager.enableLighting(); - GlStateManager.enableLight(0); - GlStateManager.enableLight(1); - GlStateManager.enableColorMaterial(); - GlStateManager.colorMaterial(1032, 5634); - GlStateManager.popMatrix(); return Pair.of(this, null); } From ac7f2f9783f962e8e978c0f9cb9f71bdc2bf0c7f Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 19 May 2016 00:22:20 -0400 Subject: [PATCH 06/15] Remove unused commands in .obj and .mtl files, remove Electric Pump and Fluidic Plenisher TESRs --- .../java/mekanism/client/ClientProxy.java | 5 - .../client/model/ModelElectricPump.java | 189 ------------------ .../client/model/ModelFluidicPlenisher.java | 149 -------------- .../render/tileentity/RenderElectricPump.java | 39 ---- .../tileentity/RenderFluidicPlenisher.java | 39 ---- .../java/mekanism/common/CommonProxy.java | 7 - src/main/java/mekanism/common/Mekanism.java | 6 +- .../common/block/states/BlockStateBasic.java | 21 +- .../block/states/BlockStateMachine.java | 21 +- .../block/states/BlockStateGenerator.java | 21 +- .../mekanism/models/block/glow_panel.mtl | 5 - .../mekanism/models/block/glow_panel.obj.mek | 2 - 12 files changed, 34 insertions(+), 470 deletions(-) delete mode 100644 src/main/java/mekanism/client/model/ModelElectricPump.java delete mode 100644 src/main/java/mekanism/client/model/ModelFluidicPlenisher.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 6c0fcf385..410d000d5 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -84,10 +84,8 @@ import mekanism.client.render.tileentity.RenderChemicalDissolutionChamber; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDigitalMiner; import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderElectricPump; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; -import mekanism.client.render.tileentity.RenderFluidicPlenisher; import mekanism.client.render.tileentity.RenderGasTank; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderPersonalChest; @@ -293,7 +291,6 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube()); - ClientRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump", new RenderElectricPump()); ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest", new RenderPersonalChest()); ClientRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve", new RenderDynamicTank()); @@ -309,7 +306,6 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); - ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater", new RenderResistiveHeater()); @@ -371,7 +367,6 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.Substrate); registerItemRender(MekanismItems.Polyethene); registerItemRender(MekanismItems.BioFuel); -// registerItemRender(MekanismItems.GlowPanel); registerItemRender(MekanismItems.Flamethrower); registerItemRender(MekanismItems.GaugeDropper); registerItemRender(MekanismItems.FactoryInstaller); diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java deleted file mode 100644 index 8de86bbaf..000000000 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ /dev/null @@ -1,189 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelElectricPump extends ModelBase -{ - ModelRenderer pumpRingTop; - ModelRenderer pumpPortTop; - ModelRenderer pumpCasing; - ModelRenderer pumpBase; - ModelRenderer powerPort; - ModelRenderer powerConnector; - ModelRenderer powerConnectorFrame4; - ModelRenderer powerConnectorFrame3; - ModelRenderer powerConnectorFrame2; - ModelRenderer powerConnectorFrame1; - ModelRenderer pipeToggleBack; - ModelRenderer pipeToggleRingBack; - ModelRenderer pipeTogglePortBack; - ModelRenderer pipeToggleLeft; - ModelRenderer pipeToggleRingLeft; - ModelRenderer pipeTogglePortLeft; - ModelRenderer pipeToggleRight; - ModelRenderer pipeToggleRingRight; - ModelRenderer pipeTogglePortRight; - ModelRenderer pumpPipe; - - public ModelElectricPump() - { - textureWidth = 128; - textureHeight = 64; - - pumpRingTop = new ModelRenderer(this, 68, 9); - pumpRingTop.addBox(0F, 0F, 0F, 8, 1, 8); - pumpRingTop.setRotationPoint(-4F, 10F, -4F); - pumpRingTop.setTextureSize(128, 64); - pumpRingTop.mirror = true; - setRotation(pumpRingTop, 0F, 0F, 0F); - pumpPortTop = new ModelRenderer(this, 68, 0); - pumpPortTop.addBox(0F, 0F, 0F, 8, 1, 8); - pumpPortTop.setRotationPoint(-4F, 8F, -4F); - pumpPortTop.setTextureSize(128, 64); - pumpPortTop.mirror = true; - setRotation(pumpPortTop, 0F, 0F, 0F); - pumpCasing = new ModelRenderer(this, 0, 0); - pumpCasing.addBox(0F, 0F, 0F, 7, 12, 7); - pumpCasing.setRotationPoint(-3.5F, 11F, -3.5F); - pumpCasing.setTextureSize(128, 64); - pumpCasing.mirror = true; - setRotation(pumpCasing, 0F, 0F, 0F); - pumpBase = new ModelRenderer(this, 28, 0); - pumpBase.addBox(0F, 0F, 0F, 6, 15, 6); - pumpBase.setRotationPoint(-3F, 9F, -3F); - pumpBase.setTextureSize(128, 64); - pumpBase.mirror = true; - setRotation(pumpBase, 0F, 0F, 0F); - powerPort = new ModelRenderer(this, 38, 29); - powerPort.addBox(0F, 0F, 0F, 8, 8, 1); - powerPort.setRotationPoint(-4F, 12F, -8F); - powerPort.setTextureSize(128, 64); - powerPort.mirror = true; - setRotation(powerPort, 0F, 0F, 0F); - powerConnector = new ModelRenderer(this, 0, 29); - powerConnector.addBox(0F, 0F, 0F, 5, 5, 4); - powerConnector.setRotationPoint(-2.5F, 13.5F, -7F); - powerConnector.setTextureSize(128, 64); - powerConnector.mirror = true; - setRotation(powerConnector, 0F, 0F, 0F); - powerConnectorFrame4 = new ModelRenderer(this, 38, 21); - powerConnectorFrame4.addBox(0F, 0F, 0F, 1, 1, 4); - powerConnectorFrame4.setRotationPoint(2F, 18F, -7F); - powerConnectorFrame4.setTextureSize(128, 64); - powerConnectorFrame4.mirror = true; - setRotation(powerConnectorFrame4, 0F, 0F, 0F); - powerConnectorFrame3 = new ModelRenderer(this, 38, 21); - powerConnectorFrame3.addBox(0F, 0F, 0F, 1, 1, 4); - powerConnectorFrame3.setRotationPoint(-3F, 18F, -7F); - powerConnectorFrame3.setTextureSize(128, 64); - powerConnectorFrame3.mirror = true; - setRotation(powerConnectorFrame3, 0F, 0F, 0F); - powerConnectorFrame2 = new ModelRenderer(this, 38, 21); - powerConnectorFrame2.addBox(0F, 0F, 0F, 1, 1, 4); - powerConnectorFrame2.setRotationPoint(2F, 13F, -7F); - powerConnectorFrame2.setTextureSize(128, 64); - powerConnectorFrame2.mirror = true; - setRotation(powerConnectorFrame2, 0F, 0F, 0F); - powerConnectorFrame1 = new ModelRenderer(this, 38, 21); - powerConnectorFrame1.addBox(0F, 0F, 0F, 1, 1, 4); - powerConnectorFrame1.setRotationPoint(-3F, 13F, -7F); - powerConnectorFrame1.setTextureSize(128, 64); - powerConnectorFrame1.mirror = true; - setRotation(powerConnectorFrame1, 0F, 0F, 0F); - pipeToggleBack = new ModelRenderer(this, 0, 19); - pipeToggleBack.addBox(0F, 0F, 0F, 6, 6, 4); - pipeToggleBack.setRotationPoint(-3F, 13F, 3F); - pipeToggleBack.setTextureSize(128, 64); - pipeToggleBack.mirror = true; - setRotation(pipeToggleBack, 0F, 0F, 0F); - pipeToggleRingBack = new ModelRenderer(this, 18, 30); - pipeToggleRingBack.addBox(0F, 0F, 0F, 7, 7, 1); - pipeToggleRingBack.setRotationPoint(-3.5F, 12.5F, 5F); - pipeToggleRingBack.setTextureSize(128, 64); - pipeToggleRingBack.mirror = true; - setRotation(pipeToggleRingBack, 0F, 0F, 0F); - pipeTogglePortBack = new ModelRenderer(this, 20, 21); - pipeTogglePortBack.addBox(0F, 0F, 0F, 8, 8, 1); - pipeTogglePortBack.setRotationPoint(-4F, 12F, 7F); - pipeTogglePortBack.setTextureSize(128, 64); - pipeTogglePortBack.mirror = true; - setRotation(pipeTogglePortBack, 0F, 0F, 0F); - pipeToggleLeft = new ModelRenderer(this, 34, 38); - pipeToggleLeft.addBox(0F, 0F, 0F, 4, 6, 6); - pipeToggleLeft.setRotationPoint(3F, 13F, -3F); - pipeToggleLeft.setTextureSize(128, 64); - pipeToggleLeft.mirror = true; - setRotation(pipeToggleLeft, 0F, 0F, 0F); - pipeToggleRingLeft = new ModelRenderer(this, 18, 38); - pipeToggleRingLeft.addBox(0F, 0F, 0F, 1, 7, 7); - pipeToggleRingLeft.setRotationPoint(5F, 12.5F, -3.5F); - pipeToggleRingLeft.setTextureSize(128, 64); - pipeToggleRingLeft.mirror = true; - setRotation(pipeToggleRingLeft, 0F, 0F, 0F); - pipeTogglePortLeft = new ModelRenderer(this, 0, 38); - pipeTogglePortLeft.addBox(0F, 0F, 0F, 1, 8, 8); - pipeTogglePortLeft.setRotationPoint(7F, 12F, -4F); - pipeTogglePortLeft.setTextureSize(128, 64); - pipeTogglePortLeft.mirror = true; - setRotation(pipeTogglePortLeft, 0F, 0F, 0F); - pipeToggleRight = new ModelRenderer(this, 34, 38); - pipeToggleRight.mirror = true; - pipeToggleRight.addBox(0F, 0F, 0F, 4, 6, 6); - pipeToggleRight.setRotationPoint(-7F, 13F, -3F); - pipeToggleRight.setTextureSize(128, 64); - setRotation(pipeToggleRight, 0F, 0F, 0F); - pipeToggleRingRight = new ModelRenderer(this, 18, 38); - pipeToggleRingRight.addBox(0F, 0F, 0F, 1, 7, 7); - pipeToggleRingRight.setRotationPoint(-6F, 12.5F, -3.5F); - pipeToggleRingRight.setTextureSize(128, 64); - pipeToggleRingRight.mirror = true; - setRotation(pipeToggleRingRight, 0F, 0F, 0F); - pipeTogglePortRight = new ModelRenderer(this, 0, 38); - pipeTogglePortRight.addBox(0F, 0F, 0F, 1, 8, 8); - pipeTogglePortRight.setRotationPoint(-8F, 12F, -4F); - pipeTogglePortRight.setTextureSize(128, 64); - pipeTogglePortRight.mirror = true; - setRotation(pipeTogglePortRight, 0F, 0F, 0F); - pumpPipe = new ModelRenderer(this, 52, 0); - pumpPipe.addBox(0F, 0F, 0F, 4, 8, 4); - pumpPipe.setRotationPoint(-2F, 24F, -2F); - pumpPipe.setTextureSize(128, 64); - pumpPipe.mirror = true; - setRotation(pumpPipe, 0F, 0F, 0F); - } - - public void render(float size) - { - pumpRingTop.render(size); - pumpPortTop.render(size); - pumpCasing.render(size); - pumpBase.render(size); - powerPort.render(size); - powerConnector.render(size); - powerConnectorFrame4.render(size); - powerConnectorFrame3.render(size); - powerConnectorFrame2.render(size); - powerConnectorFrame1.render(size); - /*pipeToggleBack.render(size); - pipeToggleRingBack.render(size); - pipeTogglePortBack.render(size); - pipeToggleLeft.render(size); - pipeToggleRingLeft.render(size); - pipeTogglePortLeft.render(size); - pipeToggleRight.render(size); - pipeToggleRingRight.render(size); - pipeTogglePortRight.render(size); - pumpPipe.render(size);*/ - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java deleted file mode 100644 index 7f6115008..000000000 --- a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java +++ /dev/null @@ -1,149 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelFluidicPlenisher extends ModelBase -{ - ModelRenderer bearingRight; - ModelRenderer ringTank; - ModelRenderer portTop; - ModelRenderer portBack; - ModelRenderer Connector; - ModelRenderer pipeToggle; - ModelRenderer ringTop; - ModelRenderer ringBottom; - ModelRenderer tank; - ModelRenderer bearingLeft; - ModelRenderer connectorRing; - ModelRenderer rod4; - ModelRenderer rod3; - ModelRenderer rod2; - ModelRenderer rod1; - - public ModelFluidicPlenisher() - { - textureWidth = 64; - textureHeight = 64; - - bearingRight = new ModelRenderer(this, 44, 26); - bearingRight.mirror = true; - bearingRight.addBox(0F, 0F, 0F, 1, 4, 4); - bearingRight.setRotationPoint(4F, 14F, -2F); - bearingRight.setTextureSize(64, 64); - setRotation(bearingRight, 0F, 0F, 0F); - ringTank = new ModelRenderer(this, 0, 32); - ringTank.addBox(0F, 0F, 0F, 11, 1, 11); - ringTank.setRotationPoint(-5.5F, 10F, -5.5F); - ringTank.setTextureSize(64, 64); - ringTank.mirror = true; - setRotation(ringTank, 0F, 0F, 0F); - portTop = new ModelRenderer(this, 0, 21); - portTop.addBox(0F, 0F, 0F, 10, 1, 10); - portTop.setRotationPoint(-5F, 8F, -5F); - portTop.setTextureSize(64, 64); - portTop.mirror = true; - setRotation(portTop, 0F, 0F, 0F); - portBack = new ModelRenderer(this, 36, 0); - portBack.addBox(0F, 0F, 0F, 8, 8, 1); - portBack.setRotationPoint(-4F, 12F, 7F); - portBack.setTextureSize(64, 64); - portBack.mirror = true; - setRotation(portBack, 0F, 0F, 0F); - Connector = new ModelRenderer(this, 36, 9); - Connector.addBox(0F, 0F, 0F, 5, 5, 4); - Connector.setRotationPoint(-2.5F, 13.5F, 3F); - Connector.setTextureSize(64, 64); - Connector.mirror = true; - setRotation(Connector, 0F, 0F, 0F); - pipeToggle = new ModelRenderer(this, 32, 44); - pipeToggle.addBox(0F, 0F, 0F, 6, 8, 6); - pipeToggle.setRotationPoint(-3F, 24F, -3F); - pipeToggle.setTextureSize(64, 64); - pipeToggle.mirror = true; - setRotation(pipeToggle, 0F, 0F, 0F); - ringTop = new ModelRenderer(this, 0, 44); - ringTop.addBox(0F, 0F, 0F, 8, 1, 8); - ringTop.setRotationPoint(-4F, 9F, -4F); - ringTop.setTextureSize(64, 64); - ringTop.mirror = true; - setRotation(ringTop, 0F, 0F, 0F); - ringBottom = new ModelRenderer(this, 0, 53); - ringBottom.addBox(0F, 0F, 0F, 8, 1, 8); - ringBottom.setRotationPoint(-4F, 23F, -4F); - ringBottom.setTextureSize(64, 64); - ringBottom.mirror = true; - setRotation(ringBottom, 0F, 0F, 0F); - tank = new ModelRenderer(this, 0, 0); - tank.addBox(0F, 0F, 0F, 9, 12, 9); - tank.setRotationPoint(-4.5F, 11F, -4.5F); - tank.setTextureSize(64, 64); - tank.mirror = true; - setRotation(tank, 0F, 0F, 0F); - bearingLeft = new ModelRenderer(this, 44, 26); - bearingLeft.addBox(0F, 0F, 0F, 1, 4, 4); - bearingLeft.setRotationPoint(-5F, 14F, -2F); - bearingLeft.setTextureSize(64, 64); - bearingLeft.mirror = true; - setRotation(bearingLeft, 0F, 0F, 0F); - connectorRing = new ModelRenderer(this, 40, 18); - connectorRing.addBox(0F, 0F, 0F, 7, 7, 1); - connectorRing.setRotationPoint(-3.5F, 12.5F, 5F); - connectorRing.setTextureSize(64, 64); - connectorRing.mirror = true; - setRotation(connectorRing, 0F, 0F, 0F); - rod4 = new ModelRenderer(this, 0, 0); - rod4.addBox(0F, 0F, 0F, 1, 1, 3); - rod4.setRotationPoint(2F, 18F, 4F); - rod4.setTextureSize(64, 64); - rod4.mirror = true; - setRotation(rod4, 0F, 0F, 0F); - rod3 = new ModelRenderer(this, 0, 0); - rod3.addBox(0F, 0F, 0F, 1, 1, 3); - rod3.setRotationPoint(-3F, 18F, 4F); - rod3.setTextureSize(64, 64); - rod3.mirror = true; - setRotation(rod3, 0F, 0F, 0F); - rod2 = new ModelRenderer(this, 0, 0); - rod2.addBox(0F, 0F, 0F, 1, 1, 3); - rod2.setRotationPoint(2F, 13F, 4F); - rod2.setTextureSize(64, 64); - rod2.mirror = true; - setRotation(rod2, 0F, 0F, 0F); - rod1 = new ModelRenderer(this, 0, 0); - rod1.addBox(0F, 0F, 0F, 1, 1, 3); - rod1.setRotationPoint(-3F, 13F, 4F); - rod1.setTextureSize(64, 64); - rod1.mirror = true; - setRotation(rod1, 0F, 0F, 0F); - } - - public void render(float size) - { - bearingRight.render(size); - ringTank.render(size); - portTop.render(size); - portBack.render(size); - Connector.render(size); - //pipeToggle.render(size); - ringTop.render(size); - ringBottom.render(size); - tank.render(size); - bearingLeft.render(size); - connectorRing.render(size); - rod4.render(size); - rod3.render(size); - rod2.render(size); - rod1.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java deleted file mode 100644 index b1d374a55..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ /dev/null @@ -1,39 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelElectricPump; -import mekanism.common.tile.TileEntityElectricPump; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderElectricPump extends TileEntitySpecialRenderer -{ - private ModelElectricPump model = new ModelElectricPump(); - - @Override - public void renderTileEntityAt(TileEntityElectricPump tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java deleted file mode 100644 index 0e0906059..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java +++ /dev/null @@ -1,39 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelFluidicPlenisher; -import mekanism.common.tile.TileEntityFluidicPlenisher; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderFluidicPlenisher extends TileEntitySpecialRenderer -{ - private ModelFluidicPlenisher model = new ModelFluidicPlenisher(); - - @Override - public void renderTileEntityAt(TileEntityFluidicPlenisher tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 69f95c0f0..839a76873 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -63,7 +63,6 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; -import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.tile.TileEntityBoilerValve; @@ -95,9 +94,6 @@ import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; -import mekanism.common.tile.TileEntityInductionCell; -import mekanism.common.tile.TileEntityInductionPort; -import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; @@ -115,7 +111,6 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; -import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.block.Block; @@ -164,7 +159,6 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser"); GameRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank"); GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube"); - GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest"); GameRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank"); GameRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve"); @@ -182,7 +176,6 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator"); GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); GameRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank"); - GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); GameRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator"); GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator"); GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index b84d38cd5..2f505a468 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -84,7 +84,9 @@ import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; +import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -788,11 +790,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName )); -/* CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismItems.GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName )); -*/ } CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i), @@ -1202,6 +1202,8 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityChemicalOxidizer.class, "ChemicalOxidizer"); GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser"); GameRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator"); + GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); + GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); //Load tile entities that have special renderers. proxy.registerSpecialTileEntities(); diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index b2cebc522..3e11545a8 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -259,20 +259,19 @@ public class BlockStateBasic extends ExtendedBlockState { EnumFacing facing = state.getValue(BlockStateFacing.facingProperty); - if(type.canRotateTo(facing)) + if(!type.canRotateTo(facing)) { - if(builder.length() > 0) - { - builder.append(","); - } - - builder.append(BlockStateFacing.facingProperty.getName()); - builder.append("="); - builder.append(facing.getName()); + facing = EnumFacing.NORTH; } - else { - return new ModelResourceLocation("builtin/missing", "missing"); + + if(builder.length() > 0) + { + builder.append(","); } + + builder.append(BlockStateFacing.facingProperty.getName()); + builder.append("="); + builder.append(facing.getName()); } if(type.tiers) diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index ff97aadc8..5e126c33b 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -433,20 +433,19 @@ public class BlockStateMachine extends ExtendedBlockState { EnumFacing facing = state.getValue(BlockStateFacing.facingProperty); - if(type.canRotateTo(facing)) + if(!type.canRotateTo(facing)) { - if(builder.length() > 0) - { - builder.append(","); - } - - builder.append(BlockStateFacing.facingProperty.getName()); - builder.append("="); - builder.append(facing.getName()); + facing = EnumFacing.NORTH; } - else { - return new ModelResourceLocation("builtin/missing", "missing"); + + if(builder.length() > 0) + { + builder.append(","); } + + builder.append(BlockStateFacing.facingProperty.getName()); + builder.append("="); + builder.append(facing.getName()); } if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java index 6ae46fa69..1a9776507 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -231,20 +231,19 @@ public class BlockStateGenerator extends ExtendedBlockState { EnumFacing facing = state.getValue(BlockStateFacing.facingProperty); - if(type.canRotateTo(facing)) + if(!type.canRotateTo(facing)) { - if(builder.length() > 0) - { - builder.append(","); - } - - builder.append(BlockStateFacing.facingProperty.getName()); - builder.append("="); - builder.append(facing.getName()); + facing = EnumFacing.NORTH; } - else { - return new ModelResourceLocation("builtin/missing", "missing"); + + if(builder.length() > 0) + { + builder.append(","); } + + builder.append(BlockStateFacing.facingProperty.getName()); + builder.append("="); + builder.append(facing.getName()); } if(builder.length() == 0) diff --git a/src/main/resources/assets/mekanism/models/block/glow_panel.mtl b/src/main/resources/assets/mekanism/models/block/glow_panel.mtl index f3b0f91ad..8de90ff7a 100644 --- a/src/main/resources/assets/mekanism/models/block/glow_panel.mtl +++ b/src/main/resources/assets/mekanism/models/block/glow_panel.mtl @@ -2,11 +2,6 @@ # Material Count: 1 newmtl Material -Ns 96.078431 -Ka 0.000000 0.000000 0.000000 Kd 0.640000 0.640000 0.640000 -Ks 0.500000 0.500000 0.500000 -Ni 1.000000 d 1.000000 -illum 2 map_Kd mekanism:blocks/models/multipart/GlowPanel diff --git a/src/main/resources/assets/mekanism/models/block/glow_panel.obj.mek b/src/main/resources/assets/mekanism/models/block/glow_panel.obj.mek index d990cba8d..351b7e67a 100644 --- a/src/main/resources/assets/mekanism/models/block/glow_panel.obj.mek +++ b/src/main/resources/assets/mekanism/models/block/glow_panel.obj.mek @@ -29,7 +29,6 @@ vn -1.000000 -0.000000 -0.000000 vn 0.000000 -0.000000 -1.000000 vn 1.000000 0.000000 0.000000 usemtl Material -s off f 1/1/1 2/2/1 3/3/1 4/4/1 f 5/1/2 8/2/2 7/3/2 6/4/2 f 1/5/3 5/3/3 6/4/3 2/6/3 @@ -64,7 +63,6 @@ vn -1.000000 -0.000000 -0.000000 vn 0.000000 -0.000000 -1.000000 vn 1.000000 0.000000 0.000000 usemtl Material -s off f 9/13/7 10/14/7 11/15/7 12/16/7 f 13/13/8 16/14/8 15/15/8 14/16/8 f 9/17/9 13/15/9 14/16/9 10/18/9 From 89604ac199e5ec180451d4437a0f7b0e4977e4d3 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 19 May 2016 00:50:44 -0400 Subject: [PATCH 07/15] Start on JEI plugin, bump Forge version, fixed Mod ID filters (ItemRegistryUtils) --- build.properties | 2 +- .../gui/GuiOredictionificatorFilter.java | 3 +- .../java/mekanism/client/jei/MekanismJEI.java | 43 +++++++++++++++ .../java/mekanism/common/OreDictCache.java | 4 +- .../common/content/transporter/Finder.java | 3 +- .../common/util/ItemRegistryUtils.java | 53 +++++++++++++++++++ .../mekanism/common/util/MekanismUtils.java | 21 +------- 7 files changed, 105 insertions(+), 24 deletions(-) create mode 100644 src/main/java/mekanism/client/jei/MekanismJEI.java create mode 100644 src/main/java/mekanism/common/util/ItemRegistryUtils.java diff --git a/build.properties b/build.properties index 4e7abc984..c097b6e1e 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.8.9 mappings_version=stable_22 -forge_version=11.15.1.1722 +forge_version=11.15.1.1902 mcmp_version=1.0.9_47 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index 8f2558245..de7e7339a 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -12,6 +12,7 @@ import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOredictionificator.OredictionificatorFilter; +import mekanism.common.util.ItemRegistryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -176,7 +177,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism { if(renderStack != null) { - String name = MekanismUtils.getMod(renderStack); + String name = ItemRegistryUtils.getMod(renderStack); String extra = name.equals("null") ? "" : " (" + name + ")"; drawCreativeTabHoveringText(renderStack.getDisplayName() + extra, xAxis, yAxis); diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java new file mode 100644 index 000000000..bcb0532d9 --- /dev/null +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -0,0 +1,43 @@ +package mekanism.client.jei; + +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IJeiRuntime; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import mezz.jei.api.JEIPlugin; + +@JEIPlugin +public class MekanismJEI implements IModPlugin +{ + @Override + public void register(IModRegistry registry) + { + + } + + @Override + public void onItemRegistryAvailable(IItemRegistry registry) + { + + } + + @Override + public void onJeiHelpersAvailable(IJeiHelpers helpers) + { + + } + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry registry) + { + + } + + @Override + public void onRuntimeAvailable(IJeiRuntime runtime) + { + + } +} diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 1badf146d..873bf9374 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import mekanism.api.util.ItemInfo; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.ItemRegistryUtils; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -122,7 +122,7 @@ public final class OreDictCache for(ItemStack stack : OreDictionary.getOres(key)) { ItemStack toAdd = stack.copy(); - String s = MekanismUtils.getMod(toAdd); + String s = ItemRegistryUtils.getMod(toAdd); if(!stacks.contains(stack) && toAdd.getItem() instanceof ItemBlock) { diff --git a/src/main/java/mekanism/common/content/transporter/Finder.java b/src/main/java/mekanism/common/content/transporter/Finder.java index f4f13981f..fe885dcb0 100644 --- a/src/main/java/mekanism/common/content/transporter/Finder.java +++ b/src/main/java/mekanism/common/content/transporter/Finder.java @@ -3,6 +3,7 @@ package mekanism.common.content.transporter; import java.util.List; import mekanism.api.util.StackUtils; +import mekanism.common.util.ItemRegistryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -128,7 +129,7 @@ public abstract class Finder return false; } - String id = MekanismUtils.getMod(stack); + String id = ItemRegistryUtils.getMod(stack); if(modID.equals(id) || modID.equals("*")) { diff --git a/src/main/java/mekanism/common/util/ItemRegistryUtils.java b/src/main/java/mekanism/common/util/ItemRegistryUtils.java new file mode 100644 index 000000000..1af8c64c1 --- /dev/null +++ b/src/main/java/mekanism/common/util/ItemRegistryUtils.java @@ -0,0 +1,53 @@ +package mekanism.common.util; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; + +import org.apache.commons.lang3.text.WordUtils; + +public class ItemRegistryUtils +{ + private static final Map modIDMap = new HashMap(); + + private static void populateMap() + { + for(Map.Entry entry : Loader.instance().getIndexedModList().entrySet()) + { + modIDMap.put(entry.getKey().toLowerCase(), entry.getValue().getName()); + } + } + + /* Mod ID lookup thanks to JEI */ + public static String getMod(ItemStack stack) + { + if(stack == null || stack.getItem() == null) + { + return "null"; + } + + if(modIDMap.isEmpty()) + { + populateMap(); + } + + ResourceLocation itemResourceLocation = Item.itemRegistry.getNameForObject(stack.getItem()); + String modId = itemResourceLocation.getResourceDomain(); + String lowercaseModId = modId.toLowerCase(Locale.ENGLISH); + String modName = modIDMap.get(lowercaseModId); + + if(modName == null) + { + modName = WordUtils.capitalize(modId); + modIDMap.put(lowercaseModId, modName); + } + + return modName; + } +} diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 154e364c2..dc0f1921f 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -83,7 +83,6 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; @@ -91,7 +90,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -1370,8 +1368,8 @@ public final class MekanismUtils if((dmgItems[1] != null) && (dmgItems[0].getItem() == dmgItems[1].getItem()) && (dmgItems[0].stackSize == 1) && (dmgItems[1].stackSize == 1) && dmgItems[0].getItem().isRepairable()) { Item theItem = dmgItems[0].getItem(); - int dmgDiff0 = theItem.getMaxDamage() - dmgItems[0].getItemDamage/*TODO:ForDisplay*/(); - int dmgDiff1 = theItem.getMaxDamage() - dmgItems[1].getItemDamage/*TODO:ForDisplay*/(); + int dmgDiff0 = theItem.getMaxDamage() - dmgItems[0].getItemDamage(); + int dmgDiff1 = theItem.getMaxDamage() - dmgItems[1].getItemDamage(); int value = dmgDiff0 + dmgDiff1 + theItem.getMaxDamage() * 5 / 100; int solve = Math.max(0, theItem.getMaxDamage() - value); @@ -1417,21 +1415,6 @@ public final class MekanismUtils return general.opsBypassRestrictions && player.mcServer.getConfigurationManager().canSendCommands(player.getGameProfile()); } - /** - * Gets the mod ID of the mod owning the given ItemStack. - * @param stack - ItemStack to check - * @return mod ID of the ItemStack's owner - */ - public static String getMod(ItemStack stack) - { - try { - ModContainer mod = null;//TODO:GameData.findModOwner(GameData.getItemRegistry().getNameForObject(stack.getItem())); - return mod == null ? "Minecraft" : mod.getName(); - } catch(Exception e) { - return "null"; - } - } - /** * Gets the item ID from a given ItemStack * @param itemStack - ItemStack to check From be863a4289e497ec6e6b76d53ad5eef230c9167f Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 19 May 2016 18:48:59 -0400 Subject: [PATCH 08/15] Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound --- .../java/mekanism/client/jei/MekanismJEI.java | 37 ++--- .../jei/ShapedMekanismRecipeHandler.java | 33 +++++ .../jei/ShapedMekanismRecipeWrapper.java | 62 +++++++++ .../jei/ShapelessMekanismRecipeHandler.java | 38 ++++++ .../jei/ShapelessMekanismRecipeWrapper.java | 49 +++++++ .../mekanism/common/block/BlockMachine.java | 8 +- .../common/inventory/InventoryBin.java | 30 +--- .../common/item/ItemAtomicDisassembler.java | 16 +-- .../mekanism/common/item/ItemBlockBasic.java | 25 ++-- .../common/item/ItemBlockCardboardBox.java | 12 +- .../common/item/ItemBlockEnergyCube.java | 58 ++------ .../common/item/ItemBlockGasTank.java | 63 ++------- .../common/item/ItemBlockMachine.java | 118 +++++----------- .../common/item/ItemConfigurationCard.java | 19 +-- .../common/item/ItemConfigurator.java | 20 +-- .../common/item/ItemCraftingFormula.java | 29 +--- .../mekanism/common/item/ItemElectricBow.java | 33 +---- .../mekanism/common/item/ItemEnergized.java | 17 +-- .../common/item/ItemFlamethrower.java | 41 ++---- .../mekanism/common/item/ItemFreeRunners.java | 23 +--- .../mekanism/common/item/ItemGasMask.java | 6 - .../common/item/ItemGaugeDropper.java | 37 ++--- .../mekanism/common/item/ItemJetpack.java | 39 ++---- .../common/item/ItemPortableTeleporter.java | 37 ++--- .../java/mekanism/common/item/ItemProxy.java | 31 +---- .../java/mekanism/common/item/ItemRobit.java | 36 +---- .../mekanism/common/item/ItemScubaTank.java | 31 +---- .../common/item/ItemWalkieTalkie.java | 33 +---- .../mekanism/common/recipe/BinRecipe.java | 3 +- .../tile/TileEntityChemicalCrystallizer.java | 5 +- .../TileEntityChemicalDissolutionChamber.java | 9 +- .../tile/TileEntityChemicalInfuser.java | 13 +- .../tile/TileEntityChemicalOxidizer.java | 5 +- .../common/tile/TileEntityChemicalWasher.java | 13 +- .../common/tile/TileEntityDigitalMiner.java | 39 +++--- .../tile/TileEntityElectrolyticSeparator.java | 13 +- .../common/tile/TileEntityFactory.java | 10 +- .../tile/TileEntityLogisticalSorter.java | 25 ++-- .../tile/TileEntityOredictionificator.java | 11 +- .../mekanism/common/tile/TileEntityPRC.java | 13 +- .../tile/TileEntityRotaryCondensentrator.java | 9 +- .../tile/TileEntitySolarNeutronActivator.java | 11 +- .../tile/component/TileComponentConfig.java | 4 +- .../mekanism/common/util/ItemDataUtils.java | 129 ++++++++++++++++++ .../common/util/ItemRegistryUtils.java | 2 +- .../mekanism/common/util/MekanismUtils.java | 2 +- .../mekanism/common/util/RecipeUtils.java | 9 +- .../generators/client/jei/GeneratorsJEI.java | 34 +++++ .../common/item/ItemBlockGenerator.java | 84 +++--------- .../generators/common/item/ItemHohlraum.java | 27 ++-- .../common/tile/TileEntityBioGenerator.java | 5 +- .../common/tile/TileEntityGasGenerator.java | 7 +- .../common/tile/TileEntityHeatGenerator.java | 5 +- 53 files changed, 679 insertions(+), 789 deletions(-) create mode 100644 src/main/java/mekanism/client/jei/ShapedMekanismRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/ShapedMekanismRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/ShapelessMekanismRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/ShapelessMekanismRecipeWrapper.java create mode 100644 src/main/java/mekanism/common/util/ItemDataUtils.java create mode 100644 src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 12a185c4e..6fbc7782f 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -2,6 +2,7 @@ package mekanism.client.jei; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.util.ItemDataUtils; import mezz.jei.api.IItemRegistry; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; @@ -9,41 +10,45 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.IRecipeRegistry; import mezz.jei.api.JEIPlugin; +import mezz.jei.api.recipe.IRecipeHandler; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @JEIPlugin public class MekanismJEI implements IModPlugin { + public static final String[] UNUSED_TAGS = new String[] {ItemDataUtils.DATA_ID}; + @Override public void register(IModRegistry registry) { registry.addAdvancedGuiHandlers(new GuiElementHandler()); + registry.addRecipeHandlers(new IRecipeHandler[] {new ShapedMekanismRecipeHandler()}); + registry.addRecipeHandlers(new IRecipeHandler[] {new ShapelessMekanismRecipeHandler()}); + registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(MekanismItems.ItemProxy)); registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(MekanismBlocks.BoundingBlock)); + + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.EnergyCube), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.MachineBlock), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.BasicBlock), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.GasTank), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.CardboardBox), UNUSED_TAGS); } @Override - public void onItemRegistryAvailable(IItemRegistry registry) - { - - } + public void onItemRegistryAvailable(IItemRegistry registry) {} @Override - public void onJeiHelpersAvailable(IJeiHelpers helpers) - { - - } + public void onJeiHelpersAvailable(IJeiHelpers helpers) {} @Override - public void onRecipeRegistryAvailable(IRecipeRegistry registry) - { - - } + public void onRecipeRegistryAvailable(IRecipeRegistry registry) {} @Override - public void onRuntimeAvailable(IJeiRuntime runtime) - { - - } + public void onRuntimeAvailable(IJeiRuntime runtime) {} } diff --git a/src/main/java/mekanism/client/jei/ShapedMekanismRecipeHandler.java b/src/main/java/mekanism/client/jei/ShapedMekanismRecipeHandler.java new file mode 100644 index 000000000..27625fa7c --- /dev/null +++ b/src/main/java/mekanism/client/jei/ShapedMekanismRecipeHandler.java @@ -0,0 +1,33 @@ +package mekanism.client.jei; + +import mekanism.common.recipe.ShapedMekanismRecipe; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.recipe.VanillaRecipeCategoryUid; + +public class ShapedMekanismRecipeHandler implements IRecipeHandler +{ + @Override + public String getRecipeCategoryUid() + { + return VanillaRecipeCategoryUid.CRAFTING; + } + + @Override + public Class getRecipeClass() + { + return ShapedMekanismRecipe.class; + } + + @Override + public IRecipeWrapper getRecipeWrapper(ShapedMekanismRecipe recipe) + { + return new ShapedMekanismRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(ShapedMekanismRecipe recipe) + { + return true; + } +} diff --git a/src/main/java/mekanism/client/jei/ShapedMekanismRecipeWrapper.java b/src/main/java/mekanism/client/jei/ShapedMekanismRecipeWrapper.java new file mode 100644 index 000000000..1f471480b --- /dev/null +++ b/src/main/java/mekanism/client/jei/ShapedMekanismRecipeWrapper.java @@ -0,0 +1,62 @@ +package mekanism.client.jei; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.ShapedMekanismRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ShapedMekanismRecipeWrapper extends BlankRecipeWrapper implements IShapedCraftingRecipeWrapper +{ + @Nonnull + private final ShapedMekanismRecipe recipe; + + public ShapedMekanismRecipeWrapper(@Nonnull ShapedMekanismRecipe r) + { + recipe = r; + + for(Object input : this.recipe.getInput()) + { + if(input instanceof ItemStack) + { + ItemStack itemStack = (ItemStack)input; + + if(itemStack.stackSize != 1) + { + itemStack.stackSize = 1; + } + } + } + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(recipe.getInput()); + } + + @Nonnull + @Override + public List getOutputs() + { + return Collections.singletonList(recipe.getRecipeOutput()); + } + + @Override + public int getWidth() + { + return recipe.width; + } + + @Override + public int getHeight() + { + return recipe.height; + } +} diff --git a/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeHandler.java b/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeHandler.java new file mode 100644 index 000000000..18f606830 --- /dev/null +++ b/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeHandler.java @@ -0,0 +1,38 @@ +package mekanism.client.jei; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.ShapelessMekanismRecipe; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.recipe.VanillaRecipeCategoryUid; + +public class ShapelessMekanismRecipeHandler implements IRecipeHandler +{ + @Override + @Nonnull + public Class getRecipeClass() + { + return ShapelessMekanismRecipe.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return VanillaRecipeCategoryUid.CRAFTING; + } + + @Override + @Nonnull + public IRecipeWrapper getRecipeWrapper(@Nonnull ShapelessMekanismRecipe recipe) + { + return new ShapelessMekanismRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull ShapelessMekanismRecipe recipe) + { + return true; + } +} diff --git a/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeWrapper.java b/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeWrapper.java new file mode 100644 index 000000000..7257e9f27 --- /dev/null +++ b/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeWrapper.java @@ -0,0 +1,49 @@ +package mekanism.client.jei; + +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.ShapelessMekanismRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ShapelessMekanismRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper +{ + @Nonnull + private final ShapelessMekanismRecipe recipe; + + public ShapelessMekanismRecipeWrapper(@Nonnull ShapelessMekanismRecipe r) + { + recipe = r; + + for(Object input : recipe.getInput()) + { + if(input instanceof ItemStack) + { + ItemStack itemStack = (ItemStack)input; + + if(itemStack.stackSize != 1) + { + itemStack.stackSize = 1; + } + } + } + } + + @Nonnull + @Override + public List getInputs() + { + return recipe.getInput(); + } + + @Nonnull + @Override + public List getOutputs() + { + return Collections.singletonList(recipe.getRecipeOutput()); + } +} diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index b8d8674c2..e8c21508c 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -46,6 +46,7 @@ import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; @@ -864,14 +865,15 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock if(tileEntity instanceof IUpgradeTile) { - ((IUpgradeTile)tileEntity).getComponent().write(itemStack.getTagCompound()); + ((IUpgradeTile)tileEntity).getComponent().write(ItemDataUtils.getDataMap(itemStack)); } if(tileEntity instanceof ISideConfiguration) { ISideConfiguration config = (ISideConfiguration)tileEntity; - config.getConfig().write(itemStack.getTagCompound()); + config.getConfig().write(ItemDataUtils.getDataMap(itemStack)); + config.getEjector().write(ItemDataUtils.getDataMap(itemStack)); } if(tileEntity instanceof ISustainedData) @@ -882,7 +884,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock if(tileEntity instanceof IRedstoneControl) { IRedstoneControl control = (IRedstoneControl)tileEntity; - itemStack.getTagCompound().setInteger("controlType", control.getControlType().ordinal()); + ItemDataUtils.setInt(itemStack, "controlType", control.getControlType().ordinal()); } if(tileEntity instanceof IStrictEnergyStorage) diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index ce4adb7f2..b7104fb2b 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -4,6 +4,7 @@ import mekanism.api.util.StackUtils; import mekanism.common.Tier.BinTier; import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; +import mekanism.common.util.ItemDataUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -101,22 +102,12 @@ public class InventoryBin public int getItemCount() { - if(bin.getTagCompound() == null) - { - return 0; - } - - return bin.getTagCompound().getInteger("itemCount"); + return ItemDataUtils.getInt(bin, "itemCount"); } public void setItemCount(int count) { - if(bin.getTagCompound() == null) - { - bin.setTagCompound(new NBTTagCompound()); - } - - bin.getTagCompound().setInteger("itemCount", Math.max(0, count)); + ItemDataUtils.setInt(bin, "itemCount", Math.max(0, count)); if(getItemCount() == 0) { @@ -126,29 +117,22 @@ public class InventoryBin public ItemStack getItemType() { - if(bin.getTagCompound() == null || getItemCount() == 0) + if(getItemCount() == 0) { return null; } - return ItemStack.loadItemStackFromNBT(bin.getTagCompound().getCompoundTag("storedItem")); + return ItemStack.loadItemStackFromNBT(ItemDataUtils.getCompound(bin, "storedItem")); } public void setItemType(ItemStack stack) { - if(bin.getTagCompound() == null) - { - bin.setTagCompound(new NBTTagCompound()); - } - if(stack == null) { - bin.getTagCompound().removeTag("storedItem"); + ItemDataUtils.removeData(bin, "storedItem"); return; } - ItemStack ret = StackUtils.size(stack, 1); - - bin.getTagCompound().setTag("storedItem", StackUtils.size(stack, 1).writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(bin, "storedItem", StackUtils.size(stack, 1).writeToNBT(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 08b00ed79..8db94439c 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -18,7 +19,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; @@ -276,12 +276,7 @@ public class ItemAtomicDisassembler extends ItemEnergized public int getMode(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getInteger("mode"); + return ItemDataUtils.getInt(itemStack, "mode"); } public String getModeName(ItemStack itemStack) @@ -307,12 +302,7 @@ public class ItemAtomicDisassembler extends ItemEnergized public void toggleMode(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setInteger("mode", getMode(itemStack) < 4 ? getMode(itemStack)+1 : 0); + ItemDataUtils.setInt(itemStack, "mode", getMode(itemStack) < 4 ? getMode(itemStack)+1 : 0); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 10897e018..9d9f86b4e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -24,6 +24,7 @@ import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityMultiblock; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -189,7 +190,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt @Override public boolean hasContainerItem(ItemStack stack) { - return BasicBlockType.get(stack) == BasicBlockType.BIN && stack.getTagCompound() != null && stack.getTagCompound().hasKey("newCount"); + return BasicBlockType.get(stack) == BasicBlockType.BIN && ItemDataUtils.hasData(stack, "newCount"); } @Override @@ -197,16 +198,16 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { if(BasicBlockType.get(stack) == BasicBlockType.BIN) { - if(stack.getTagCompound() == null || !stack.getTagCompound().hasKey("newCount")) + if(!ItemDataUtils.hasData(stack, "newCount")) { return null; } - int newCount = stack.getTagCompound().getInteger("newCount"); - stack.getTagCompound().removeTag("newCount"); + int newCount = ItemDataUtils.getInt(stack, "newCount"); + ItemDataUtils.removeData(stack, "newCount"); ItemStack ret = stack.copy(); - ret.getTagCompound().setInteger("itemCount", newCount); + ItemDataUtils.setInt(ret, "itemCount", newCount); return ret; } @@ -302,12 +303,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { if(BasicBlockType.get(itemStack) == BasicBlockType.INDUCTION_CELL) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getDouble("energyStored"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } return 0; @@ -318,12 +314,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { if(BasicBlockType.get(itemStack) == BasicBlockType.INDUCTION_CELL) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setDouble("energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 2221fbded..4a968bc71 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -7,6 +7,7 @@ import mekanism.api.MekanismAPI; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockCardboardBox.BlockData; import mekanism.common.tile.TileEntityCardboardBox; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -139,22 +140,17 @@ public class ItemBlockCardboardBox extends ItemBlock public void setBlockData(ItemStack itemstack, BlockData data) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - itemstack.getTagCompound().setTag("blockData", data.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "blockData", data.write(new NBTTagCompound())); } public BlockData getBlockData(ItemStack itemstack) { - if(itemstack.getTagCompound() == null || !itemstack.getTagCompound().hasKey("blockData")) + if(!ItemDataUtils.hasData(itemstack, "blockData")) { return null; } - return BlockData.read(itemstack.getTagCompound().getCompoundTag("blockData")); + return BlockData.read(ItemDataUtils.getCompound(itemstack, "blockData")); } @SubscribeEvent diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index baa06eb9d..0597727d3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -24,6 +24,7 @@ import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityEnergyCube; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -39,7 +40,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -59,6 +59,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS super(block); metaBlock = block; setMaxStackSize(1); + setHasSubtypes(true); setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -196,14 +197,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(!itemStack.hasTagCompound()) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -212,14 +206,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(!itemStack.hasTagCompound()) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; @@ -233,7 +220,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS return 0; } - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override @@ -244,13 +231,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS return; } - if(!itemStack.hasTagCompound()) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override @@ -363,9 +344,9 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override public String getOwner(ItemStack stack) { - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -374,40 +355,25 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override public void setOwner(ItemStack stack, String owner) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(!stack.hasTagCompound()) - { - return SecurityMode.PUBLIC; - } - - return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; + return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("security", mode.ordinal()); + ItemDataUtils.setInt(stack, "security", mode.ordinal()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 6cba41af2..d8a45c6c1 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -23,6 +23,7 @@ import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityGasTank; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; @@ -38,7 +39,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.relauncher.Side; public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem, ISecurityItem @@ -147,31 +147,21 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public GasStack getGas(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); } @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } @@ -295,14 +285,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(!itemStack.hasTagCompound()) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -311,14 +294,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(!itemStack.hasTagCompound()) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; @@ -339,9 +315,9 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public String getOwner(ItemStack stack) { - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -350,40 +326,25 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public void setOwner(ItemStack stack, String owner) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return SecurityMode.PUBLIC; - } - - return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; + return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("security", mode.ordinal()); + ItemDataUtils.setInt(stack, "security", mode.ordinal()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3042fcbe1..30e38babc 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -38,6 +38,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -58,7 +59,6 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -235,9 +235,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } - if(type.supportsUpgrades && itemstack.getTagCompound() != null && itemstack.getTagCompound().hasKey("upgrades")) + if(type.supportsUpgrades && ItemDataUtils.hasData(itemstack, "upgrades")) { - Map upgrades = Upgrade.buildMap(itemstack.getTagCompound()); + Map upgrades = Upgrade.buildMap(ItemDataUtils.getDataMap(itemstack)); for(Map.Entry entry : upgrades.entrySet()) { @@ -326,9 +326,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(tileEntity instanceof IUpgradeTile) { - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("upgrades")) + if(ItemDataUtils.hasData(stack, "upgrades")) { - ((IUpgradeTile)tileEntity).getComponent().read(stack.getTagCompound()); + ((IUpgradeTile)tileEntity).getComponent().read(ItemDataUtils.getDataMap(stack)); } } @@ -336,9 +336,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { ISideConfiguration config = (ISideConfiguration)tileEntity; - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("sideDataStored")) + if(ItemDataUtils.hasData(stack, "sideDataStored")) { - config.getConfig().read(stack.getTagCompound()); + config.getConfig().read(ItemDataUtils.getDataMap(stack)); + config.getEjector().read(ItemDataUtils.getDataMap(stack)); } } @@ -352,9 +353,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(tileEntity instanceof IRedstoneControl) { - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("controlType")) + if(ItemDataUtils.hasData(stack, "controlType")) { - ((IRedstoneControl)tileEntity).setControlType(RedstoneControl.values()[stack.getTagCompound().getInteger("controlType")]); + ((IRedstoneControl)tileEntity).setControlType(RedstoneControl.values()[ItemDataUtils.getInt(stack, "controlType")]); } } @@ -611,14 +612,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -627,14 +621,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; @@ -646,18 +633,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(data[0] instanceof ItemStack) { ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluid() == null) { - itemStack.getTagCompound().removeTag("fluidTank"); + ItemDataUtils.removeData(itemStack, "fluidTank"); } else { - itemStack.getTagCompound().setTag("fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); } } } @@ -669,15 +651,12 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { ItemStack itemStack = (ItemStack)data[0]; - if(itemStack.getTagCompound() == null) + if(!ItemDataUtils.hasData(itemStack, "fluidTank")) { return null; } - if(itemStack.getTagCompound().hasKey("fluidTank")) - { - return FluidStack.loadFluidStackFromNBT(itemStack.getTagCompound().getCompoundTag("fluidTank")); - } + return FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(itemStack, "fluidTank")); } return null; @@ -698,33 +677,23 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec public void setBucketMode(ItemStack itemStack, boolean bucketMode) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setBoolean("bucketMode", bucketMode); + ItemDataUtils.setBoolean(itemStack, "bucketMode", bucketMode); } public boolean getBucketMode(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return false; - } - - return itemStack.getTagCompound().getBoolean("bucketMode"); + return ItemDataUtils.getBoolean(itemStack, "bucketMode"); } @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null || !MachineType.get(itemStack).isElectric) + if(!MachineType.get(itemStack).isElectric) { return 0; } - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override @@ -735,13 +704,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return; } - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override @@ -774,14 +737,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); + double toReceive = Math.min(energy*general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive* general.TO_TE); + return (int)Math.round(toReceive*general.TO_TE); } return 0; @@ -793,14 +756,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy* general.FROM_TE), energyRemaining); + double toSend = Math.min((energy*general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend* general.TO_TE); + return (int)Math.round(toSend*general.TO_TE); } return 0; @@ -809,13 +772,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem) * general.TO_TE); + return (int)(getEnergy(theItem)*general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem) * general.TO_TE); + return (int)(getMaxEnergy(theItem)*general.TO_TE); } @Override @@ -933,9 +896,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public String getOwner(ItemStack stack) { - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -944,40 +907,25 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public void setOwner(ItemStack stack, String owner) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return SecurityMode.PUBLIC; - } - - return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; + return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("security", mode.ordinal()); + ItemDataUtils.setInt(stack, "security", mode.ordinal()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 8c1758cc4..2626f9fd5 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -9,6 +9,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -140,35 +141,25 @@ public class ItemConfigurationCard extends ItemMekanism public void setData(ItemStack itemstack, NBTTagCompound data) { - if(itemstack.hasTagCompound()) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(data != null) { - itemstack.getTagCompound().setTag("data", data); + ItemDataUtils.setCompound(itemstack, "data", data); } else { - itemstack.getTagCompound().removeTag("data"); + ItemDataUtils.removeData(itemstack, "data"); } } public NBTTagCompound getData(ItemStack itemstack) { - if(!itemstack.hasTagCompound()) - { - return null; - } - - NBTTagCompound data = itemstack.getTagCompound().getCompoundTag("data"); + NBTTagCompound data = ItemDataUtils.getCompound(itemstack, "data"); if(data.hasNoTags()) { return null; } else { - return itemstack.getTagCompound().getCompoundTag("data"); + return ItemDataUtils.getCompound(itemstack, "data"); } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 222f7cbb8..1492ce8dc 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -18,6 +18,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -237,27 +238,12 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool public void setState(ItemStack itemstack, ConfiguratorMode state) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - itemstack.getTagCompound().setInteger("state", state.ordinal()); + ItemDataUtils.setInt(itemstack, "state", state.ordinal()); } public ConfiguratorMode getState(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return ConfiguratorMode.CONFIGURATE_ITEMS; - } - - if(itemstack.getTagCompound().getTag("state") != null) - { - return ConfiguratorMode.values()[itemstack.getTagCompound().getInteger("state")]; - } - - return ConfiguratorMode.CONFIGURATE_ITEMS; + return ConfiguratorMode.values()[ItemDataUtils.getInt(itemstack, "state")]; } @Override diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index ad98f2759..c5951ead3 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -110,32 +110,22 @@ public class ItemCraftingFormula extends ItemMekanism public boolean isInvalid(ItemStack stack) { - if(!stack.hasTagCompound()) - { - return false; - } - - return stack.getTagCompound().getBoolean("invalid"); + return ItemDataUtils.getBoolean(stack, "invalid"); } public void setInvalid(ItemStack stack, boolean invalid) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setBoolean("invalid", invalid); + ItemDataUtils.setBoolean(stack, "invalid", invalid); } public ItemStack[] getInventory(ItemStack stack) { - if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey("Items")) + if(!ItemDataUtils.hasData(stack, "Items")) { return null; } - NBTTagList tagList = stack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); + NBTTagList tagList = ItemDataUtils.getList(stack, "Items"); ItemStack[] inventory = new ItemStack[9]; for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) @@ -154,14 +144,9 @@ public class ItemCraftingFormula extends ItemMekanism public void setInventory(ItemStack stack, ItemStack[] inv) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(inv == null) { - stack.getTagCompound().removeTag("Items"); + ItemDataUtils.removeData(stack, "Items"); return; } @@ -178,6 +163,6 @@ public class ItemCraftingFormula extends ItemMekanism } } - stack.getTagCompound().setTag("Items", tagList); + ItemDataUtils.setList(stack, "Items", tagList); } } diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 76892a46b..1db002d2b 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -11,7 +12,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class ItemElectricBow extends ItemEnergized @@ -107,41 +107,14 @@ public class ItemElectricBow extends ItemEnergized return itemstack; } - /** - * Sets the bow's fire state in NBT. - * @param itemstack - the bow's itemstack - * @param state - state to change to - */ public void setFireState(ItemStack itemstack, boolean state) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - itemstack.getTagCompound().setBoolean("fireState", state); + ItemDataUtils.setBoolean(itemstack, "fireState", state); } - /** - * Gets the bow's fire state from NBT. - * @param itemstack - the bow's itemstack - * @return fire state - */ public boolean getFireState(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return false; - } - - boolean state = false; - - if(itemstack.getTagCompound().getTag("fireState") != null) - { - state = itemstack.getTagCompound().getBoolean("fireState"); - } - - return state; + return ItemDataUtils.getBoolean(itemstack, "fireState"); } @Override diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 7464c2dd9..2af154ee7 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -10,13 +10,13 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -116,24 +116,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override public void setEnergy(ItemStack itemStack, double amount) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index 176e682c9..ef3eaf720 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -8,6 +8,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -99,17 +100,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { return false; } - - @Override - public GasStack getGas(ItemStack itemstack) - { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - } @Override public boolean showDurabilityBar(ItemStack stack) @@ -123,23 +113,24 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + @Override + public GasStack getGas(ItemStack itemstack) + { + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); + } + @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } @@ -169,22 +160,12 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem public FlamethrowerMode getMode(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return FlamethrowerMode.COMBAT; - } - - return FlamethrowerMode.values()[stack.getTagCompound().getInteger("mode")]; + return FlamethrowerMode.values()[ItemDataUtils.getInt(stack, "mode")]; } public void setMode(ItemStack stack, FlamethrowerMode mode) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("mode", mode.ordinal()); + ItemDataUtils.setInt(stack, "mode", mode.ordinal()); } public static enum FlamethrowerMode diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 61961d305..0718b7469 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -12,6 +12,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.model.ModelBiped; @@ -22,7 +23,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -49,12 +49,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci setCreativeTab(Mekanism.tabMekanism); } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} -*/ - @Override public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) { @@ -142,24 +136,13 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override public void setEnergy(ItemStack itemStack, double amount) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index 6f6fc758b..e010823dc 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -23,12 +23,6 @@ public class ItemGasMask extends ItemArmor setCreativeTab(Mekanism.tabMekanism); } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} -*/ - @Override public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) { diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 0409e1f51..6e6761194 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -6,6 +6,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -101,14 +102,9 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo private FluidStack getFluid_do(ItemStack container) { - if(container.getTagCompound() == null) + if(ItemDataUtils.hasData(container, "fluidStack")) { - return null; - } - - if(container.getTagCompound().hasKey("fluidStack")) - { - return FluidStack.loadFluidStackFromNBT(container.getTagCompound().getCompoundTag("fluidStack")); + return FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(container, "fluidStack")); } return null; @@ -122,17 +118,12 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo public void setFluid(ItemStack container, FluidStack stack) { - if(container.getTagCompound() == null) - { - container.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0 || stack.getFluid() == null) { - container.getTagCompound().removeTag("fluidStack"); + ItemDataUtils.removeData(container, "fluidStack"); } else { - container.getTagCompound().setTag("fluidStack", stack.writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(container, "fluidStack", stack.writeToNBT(new NBTTagCompound())); } } @@ -246,12 +237,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo private GasStack getGas_do(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("gasStack")); + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "gasStack")); } @Override @@ -261,22 +247,17 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo } @Override - public void setGas(ItemStack itemstack, GasStack stack) + public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("gasStack"); + ItemDataUtils.removeData(itemstack, "gasStack"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("gasStack", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "gasStack", gasStack.write(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 4f75d366b..4b66ca481 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -12,6 +12,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; import net.minecraft.creativetab.CreativeTabs; @@ -160,54 +161,34 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor return false; } - @Override - public GasStack getGas(ItemStack itemstack) - { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - } - public JetpackMode getMode(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return JetpackMode.NORMAL; - } - - return JetpackMode.values()[stack.getTagCompound().getInteger("mode")]; + return JetpackMode.values()[ItemDataUtils.getInt(stack, "mode")]; } public void setMode(ItemStack stack, JetpackMode mode) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } + ItemDataUtils.setInt(stack, "mode", mode.ordinal()); + } - stack.getTagCompound().setInteger("mode", mode.ordinal()); + @Override + public GasStack getGas(ItemStack itemstack) + { + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); } @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index aa6eb8c23..08c5c0965 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -8,13 +8,13 @@ import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.security.IOwnerItem; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; @@ -99,9 +99,9 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem @Override public String getOwner(ItemStack stack) { - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -115,11 +115,11 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override @@ -130,29 +130,19 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem public boolean isPrivateMode(ItemStack stack) { - if(stack.hasTagCompound()) - { - return stack.getTagCompound().getBoolean("private"); - } - - return false; + return ItemDataUtils.getBoolean(stack, "private"); } public void setPrivateMode(ItemStack stack, boolean isPrivate) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setBoolean("private", isPrivate); + ItemDataUtils.setBoolean(stack, "private", isPrivate); } public String getFrequency(ItemStack stack) { - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("frequency")) + if(ItemDataUtils.hasData(stack, "frequency")) { - return stack.getTagCompound().getString("frequency"); + return ItemDataUtils.getString(stack, "frequency"); } return null; @@ -160,17 +150,12 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem public void setFrequency(ItemStack stack, String frequency) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(frequency == null || frequency.isEmpty()) { - stack.getTagCompound().removeTag("frequency"); + ItemDataUtils.removeData(stack, "frequency"); return; } - stack.getTagCompound().setString("frequency", frequency); + ItemDataUtils.setString(stack, "frequency", frequency); } } diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index 1a8ed9ad1..317842601 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -1,5 +1,6 @@ package mekanism.common.item; +import mekanism.common.util.ItemDataUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,14 +22,6 @@ public class ItemProxy extends Item return getSavedItem(stack); } -/* - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) - { - return stack.getTagCompound() == null || !stack.getTagCompound().getBoolean("hasStack"); - } -*/ - @Override public boolean hasContainerItem(ItemStack itemStack) { @@ -37,32 +30,22 @@ public class ItemProxy extends Item public void setSavedItem(ItemStack stack, ItemStack save) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(save == null) { - stack.getTagCompound().setBoolean("hasStack", false); - stack.getTagCompound().removeTag("savedItem"); + ItemDataUtils.setBoolean(stack, "hasStack", false); + ItemDataUtils.removeData(stack, "savedItem"); } else { - stack.getTagCompound().setBoolean("hasStack", true); - stack.getTagCompound().setTag("savedItem", save.writeToNBT(new NBTTagCompound())); + ItemDataUtils.setBoolean(stack, "hasStack", true); + ItemDataUtils.setCompound(stack, "savedItem", save.writeToNBT(new NBTTagCompound())); } } public ItemStack getSavedItem(ItemStack stack) { - if(stack.getTagCompound() == null) + if(ItemDataUtils.getBoolean(stack, "hasStack")) { - return null; - } - - if(stack.getTagCompound().getBoolean("hasStack")) - { - return ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("savedItem")); + return ItemStack.loadItemStackFromNBT(ItemDataUtils.getCompound(stack, "savedItem")); } return null; diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index c80975890..e647364e7 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -7,10 +7,10 @@ import mekanism.api.EnumColor; import mekanism.common.base.ISustainedInventory; import mekanism.common.entity.EntityRobit; import mekanism.common.tile.TileEntityChargepad; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -76,24 +76,14 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory public void setName(ItemStack itemstack, String name) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - itemstack.getTagCompound().setString("name", name); + ItemDataUtils.setString(itemstack, "name", name); } public String getName(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return "Robit"; - } + String name = ItemDataUtils.getString(itemstack, "name"); - String name = itemstack.getTagCompound().getString("name"); - - return name.equals("") ? "Robit" : name; + return name.isEmpty() ? "Robit" : name; } @Override @@ -101,14 +91,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -117,14 +100,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", 10); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 127821159..69771b7cf 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -11,6 +11,7 @@ import mekanism.api.gas.IGasItem; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; import net.minecraft.creativetab.CreativeTabs; @@ -153,12 +154,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem public boolean getFlowing(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return false; - } - - return stack.getTagCompound().getBoolean("flowing"); + return ItemDataUtils.getBoolean(stack, "flowing"); } public String getFlowingStr(ItemStack stack) @@ -170,12 +166,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem public void setFlowing(ItemStack stack, boolean flowing) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setBoolean("flowing", flowing); + ItemDataUtils.setBoolean(stack, "flowing", flowing); } @Override @@ -193,31 +184,21 @@ public class ItemScubaTank extends ItemArmor implements IGasItem @Override public GasStack getGas(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); } @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 7d89b8e90..ed836be29 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -5,11 +5,11 @@ import java.util.List; import java.util.Map; import mekanism.api.EnumColor; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class ItemWalkieTalkie extends ItemMekanism @@ -62,48 +62,29 @@ public class ItemWalkieTalkie extends ItemMekanism public void setOn(ItemStack itemStack, boolean on) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setBoolean("on", on); + ItemDataUtils.setBoolean(itemStack, "on", on); } public boolean getOn(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return false; - } - - return itemStack.getTagCompound().getBoolean("on"); + return ItemDataUtils.getBoolean(itemStack, "on"); } public void setChannel(ItemStack itemStack, int channel) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setInteger("channel", channel); + ItemDataUtils.setInt(itemStack, "channel", channel); } public int getChannel(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 1; - } - - int channel = itemStack.getTagCompound().getInteger("channel"); + int channel = ItemDataUtils.getInt(itemStack, "channel"); if(channel == 0) { setChannel(itemStack, 1); + channel = 1; } - return itemStack.getTagCompound().getInteger("channel"); + return channel; } } diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index aa3ba0505..56b5a0367 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -4,6 +4,7 @@ import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemProxy; +import mekanism.common.util.ItemDataUtils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -144,7 +145,7 @@ public class BinRecipe implements IRecipe ItemStack testRemove = inv.removeStack(); - bin.getTagCompound().setInteger("newCount", size-(testRemove != null ? testRemove.stackSize : 0)); + ItemDataUtils.setInt(bin, "newCount", size-(testRemove != null ? testRemove.stackSize : 0)); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index c1774f711..cf1efbd82 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -39,6 +39,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -463,14 +464,14 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock { if(inputTank.getGas() != null) { - itemStack.getTagCompound().setTag("inputTank", inputTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "inputTank", inputTank.getGas().write(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - inputTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("inputTank"))); + inputTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "inputTank"))); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 9130a7f01..9610af1ac 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -33,6 +33,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.StatUtils; import net.minecraft.item.ItemStack; @@ -471,20 +472,20 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri { if(injectTank.getGas() != null) { - itemStack.getTagCompound().setTag("injectTank", injectTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "injectTank", injectTank.getGas().write(new NBTTagCompound())); } if(outputTank.getGas() != null) { - itemStack.getTagCompound().setTag("outputTank", outputTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "outputTank", outputTank.getGas().write(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - injectTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("injectTank"))); - outputTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("outputTank"))); + injectTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "injectTank"))); + outputTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "outputTank"))); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 590faaa4c..8a870db58 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -34,6 +34,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -511,26 +512,26 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl { if(leftTank.getGas() != null) { - itemStack.getTagCompound().setTag("leftTank", leftTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "leftTank", leftTank.getGas().write(new NBTTagCompound())); } if(rightTank.getGas() != null) { - itemStack.getTagCompound().setTag("rightTank", rightTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "rightTank", rightTank.getGas().write(new NBTTagCompound())); } if(centerTank.getGas() != null) { - itemStack.getTagCompound().setTag("centerTank", centerTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "centerTank", centerTank.getGas().write(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - leftTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("leftTank"))); - rightTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("rightTank"))); - centerTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("centerTank"))); + leftTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "leftTank"))); + rightTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "rightTank"))); + centerTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "centerTank"))); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 95cc0af37..aed99d65f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -31,6 +31,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -384,14 +385,14 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp { if(gasTank.getGas() != null) { - itemStack.getTagCompound().setTag("gasTank", gasTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "gasTank", gasTank.getGas().write(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - gasTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("gasTank"))); + gasTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "gasTank"))); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 95be55195..5987c1101 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -36,6 +36,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; @@ -565,26 +566,26 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple { if(fluidTank.getFluid() != null) { - itemStack.getTagCompound().setTag("fluidTank", fluidTank.getFluid().writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "fluidTank", fluidTank.getFluid().writeToNBT(new NBTTagCompound())); } if(inputTank.getGas() != null) { - itemStack.getTagCompound().setTag("inputTank", inputTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "inputTank", inputTank.getGas().write(new NBTTagCompound())); } if(outputTank.getGas() != null) { - itemStack.getTagCompound().setTag("outputTank", outputTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "outputTank", outputTank.getGas().write(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - fluidTank.setFluid(FluidStack.loadFluidStackFromNBT(itemStack.getTagCompound().getCompoundTag("fluidTank"))); - inputTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("inputTank"))); - outputTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("outputTank"))); + fluidTank.setFluid(FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(itemStack, "fluidTank"))); + inputTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "inputTank"))); + outputTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "outputTank"))); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 238297bbc..c884d77f1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -40,6 +40,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MinerUtils; import mekanism.common.util.TransporterUtils; @@ -1436,15 +1437,15 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public void writeSustainedData(ItemStack itemStack) { - itemStack.getTagCompound().setBoolean("hasMinerConfig", true); + ItemDataUtils.setBoolean(itemStack, "hasMinerConfig", true); - itemStack.getTagCompound().setInteger("radius", radius); - itemStack.getTagCompound().setInteger("minY", minY); - itemStack.getTagCompound().setInteger("maxY", maxY); - itemStack.getTagCompound().setBoolean("doEject", doEject); - itemStack.getTagCompound().setBoolean("doPull", doPull); - itemStack.getTagCompound().setBoolean("silkTouch", silkTouch); - itemStack.getTagCompound().setBoolean("inverse", inverse); + ItemDataUtils.setInt(itemStack, "radius", radius); + ItemDataUtils.setInt(itemStack, "minY", minY); + ItemDataUtils.setInt(itemStack, "maxY", maxY); + ItemDataUtils.setBoolean(itemStack, "doEject", doEject); + ItemDataUtils.setBoolean(itemStack, "doPull", doPull); + ItemDataUtils.setBoolean(itemStack, "silkTouch", silkTouch); + ItemDataUtils.setBoolean(itemStack, "inverse", inverse); NBTTagList filterTags = new NBTTagList(); @@ -1455,26 +1456,26 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(filterTags.tagCount() != 0) { - itemStack.getTagCompound().setTag("filters", filterTags); + ItemDataUtils.setList(itemStack, "filters", filterTags); } } @Override public void readSustainedData(ItemStack itemStack) { - if(itemStack.getTagCompound().hasKey("hasMinerConfig")) + if(ItemDataUtils.hasData(itemStack, "hasMinerConfig")) { - radius = itemStack.getTagCompound().getInteger("radius"); - minY = itemStack.getTagCompound().getInteger("minY"); - maxY = itemStack.getTagCompound().getInteger("maxY"); - doEject = itemStack.getTagCompound().getBoolean("doEject"); - doPull = itemStack.getTagCompound().getBoolean("doPull"); - silkTouch = itemStack.getTagCompound().getBoolean("silkTouch"); - inverse = itemStack.getTagCompound().getBoolean("inverse"); + radius = ItemDataUtils.getInt(itemStack, "radius"); + minY = ItemDataUtils.getInt(itemStack, "minY"); + maxY = ItemDataUtils.getInt(itemStack, "maxY"); + doEject = ItemDataUtils.getBoolean(itemStack, "doEject"); + doPull = ItemDataUtils.getBoolean(itemStack, "doPull"); + silkTouch = ItemDataUtils.getBoolean(itemStack, "silkTouch"); + inverse = ItemDataUtils.getBoolean(itemStack, "inverse"); - if(itemStack.getTagCompound().hasKey("filters")) + if(ItemDataUtils.hasData(itemStack, "filters")) { - NBTTagList tagList = itemStack.getTagCompound().getTagList("filters", NBT.TAG_COMPOUND); + NBTTagList tagList = ItemDataUtils.getList(itemStack, "filters"); for(int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index f2cc87247..d51d5153e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -39,6 +39,7 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -584,26 +585,26 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { if(fluidTank.getFluid() != null) { - itemStack.getTagCompound().setTag("fluidTank", fluidTank.getFluid().writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "fluidTank", fluidTank.getFluid().writeToNBT(new NBTTagCompound())); } if(leftTank.getGas() != null) { - itemStack.getTagCompound().setTag("leftTank", leftTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "leftTank", leftTank.getGas().write(new NBTTagCompound())); } if(rightTank.getGas() != null) { - itemStack.getTagCompound().setTag("rightTank", rightTank.getGas().write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "rightTank", rightTank.getGas().write(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - fluidTank.setFluid(FluidStack.loadFluidStackFromNBT(itemStack.getTagCompound().getCompoundTag("fluidTank"))); - leftTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("leftTank"))); - rightTank.setGas(GasStack.readFromNBT(itemStack.getTagCompound().getCompoundTag("rightTank"))); + fluidTank.setFluid(FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(itemStack, "fluidTank"))); + leftTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "leftTank"))); + rightTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "rightTank"))); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 47d1a3bc2..14ceab4d2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -54,6 +54,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.StatUtils; import net.minecraft.item.Item; @@ -311,14 +312,9 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I ItemStack returnStack = getMachineStack(); - if(returnStack.getTagCompound() == null) - { - returnStack.setTagCompound(new NBTTagCompound()); - } - - upgradeComponent.write(returnStack.getTagCompound()); + upgradeComponent.write(ItemDataUtils.getDataMap(returnStack)); upgradeComponent.setSupported(Upgrade.GAS, toSet.fuelEnergyUpgrades()); - upgradeComponent.read(inventory[2].getTagCompound()); + upgradeComponent.read(ItemDataUtils.getDataMap(inventory[2])); inventory[2] = null; inventory[3] = returnStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 9582378b3..f38a324a4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -27,6 +27,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; @@ -667,15 +668,15 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen @Override public void writeSustainedData(ItemStack itemStack) { - itemStack.getTagCompound().setBoolean("hasSorterConfig", true); + ItemDataUtils.setBoolean(itemStack, "hasSorterConfig", true); if(color != null) { - itemStack.getTagCompound().setInteger("color", TransporterUtils.colors.indexOf(color)); + ItemDataUtils.setInt(itemStack, "color", TransporterUtils.colors.indexOf(color)); } - itemStack.getTagCompound().setBoolean("autoEject", autoEject); - itemStack.getTagCompound().setBoolean("roundRobin", roundRobin); + ItemDataUtils.setBoolean(itemStack, "autoEject", autoEject); + ItemDataUtils.setBoolean(itemStack, "roundRobin", roundRobin); NBTTagList filterTags = new NBTTagList(); @@ -688,26 +689,26 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(filterTags.tagCount() != 0) { - itemStack.getTagCompound().setTag("filters", filterTags); + ItemDataUtils.setList(itemStack, "filters", filterTags); } } @Override public void readSustainedData(ItemStack itemStack) { - if(itemStack.getTagCompound().hasKey("hasSorterConfig")) + if(ItemDataUtils.hasData(itemStack, "hasSorterConfig")) { - if(itemStack.getTagCompound().hasKey("color")) + if(ItemDataUtils.hasData(itemStack, "color")) { - color = TransporterUtils.colors.get(itemStack.getTagCompound().getInteger("color")); + color = TransporterUtils.colors.get(ItemDataUtils.getInt(itemStack, "color")); } - autoEject = itemStack.getTagCompound().getBoolean("autoEject"); - roundRobin = itemStack.getTagCompound().getBoolean("roundRobin"); + autoEject = ItemDataUtils.getBoolean(itemStack, "autoEject"); + roundRobin = ItemDataUtils.getBoolean(itemStack, "roundRobin"); - if(itemStack.getTagCompound().hasKey("filters")) + if(ItemDataUtils.hasData(itemStack, "filters")) { - NBTTagList tagList = itemStack.getTagCompound().getTagList("filters", NBT.TAG_COMPOUND); + NBTTagList tagList = ItemDataUtils.getList(itemStack, "filters"); for(int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index f674a77e4..d8e53a4e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -20,6 +20,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -363,7 +364,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple @Override public void writeSustainedData(ItemStack itemStack) { - itemStack.getTagCompound().setBoolean("hasOredictionificatorConfig", true); + ItemDataUtils.setBoolean(itemStack, "hasOredictionificatorConfig", true); NBTTagList filterTags = new NBTTagList(); @@ -376,18 +377,18 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple if(filterTags.tagCount() != 0) { - itemStack.getTagCompound().setTag("filters", filterTags); + ItemDataUtils.setList(itemStack, "filters", filterTags); } } @Override public void readSustainedData(ItemStack itemStack) { - if(itemStack.getTagCompound().hasKey("hasOredictionificatorConfig")) + if(ItemDataUtils.hasData(itemStack, "hasOredictionificatorConfig")) { - if(itemStack.getTagCompound().hasKey("filters")) + if(ItemDataUtils.hasData(itemStack, "filters")) { - NBTTagList tagList = itemStack.getTagCompound().getTagList("filters", NBT.TAG_COMPOUND); + NBTTagList tagList = ItemDataUtils.getList(itemStack, "filters"); for(int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 2f2513274..6a350ae11 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -29,6 +29,7 @@ import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; @@ -451,26 +452,26 @@ public class TileEntityPRC extends TileEntityBasicMachine modIDMap = new HashMap(); diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index dc0f1921f..218ca6619 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -703,7 +703,7 @@ public final class MekanismUtils */ public static double getMaxEnergy(ItemStack itemStack, double def) { - Map upgrades = Upgrade.buildMap(itemStack.getTagCompound()); + Map upgrades = Upgrade.buildMap(ItemDataUtils.getDataMap(itemStack)); float numUpgrades = upgrades.get(Upgrade.ENERGY) == null ? 0 : (float)upgrades.get(Upgrade.ENERGY); return def * Math.pow(general.maxUpgradeMultiplier, numUpgrades/(float)Upgrade.ENERGY.getMax()); } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index da8ebe0e9..224da25ce 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -237,7 +237,7 @@ public class RecipeUtils if(itemstack != null && BlockStateMachine.MachineType.get(itemstack) != null && BlockStateMachine.MachineType.get(itemstack).supportsUpgrades) { - Map stackMap = Upgrade.buildMap(itemstack.getTagCompound()); + Map stackMap = Upgrade.buildMap(ItemDataUtils.getDataMap(itemstack)); for(Map.Entry entry : stackMap.entrySet()) { @@ -251,12 +251,7 @@ public class RecipeUtils } } - if(toReturn.getTagCompound() == null) - { - toReturn.setTagCompound(new NBTTagCompound()); - } - - Upgrade.saveMap(upgrades, toReturn.getTagCompound()); + Upgrade.saveMap(upgrades, ItemDataUtils.getDataMap(toReturn)); } return toReturn; diff --git a/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java b/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java new file mode 100644 index 000000000..a5d90446e --- /dev/null +++ b/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java @@ -0,0 +1,34 @@ +package mekanism.generators.client.jei; + +import mekanism.client.jei.MekanismJEI; +import mekanism.generators.common.GeneratorsBlocks; +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IJeiRuntime; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import mezz.jei.api.JEIPlugin; +import net.minecraft.item.Item; + +@JEIPlugin +public class GeneratorsJEI implements IModPlugin +{ + @Override + public void register(IModRegistry registry) + { + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(GeneratorsBlocks.Generator), MekanismJEI.UNUSED_TAGS); + } + + @Override + public void onItemRegistryAvailable(IItemRegistry registry) {} + + @Override + public void onJeiHelpersAvailable(IJeiHelpers helpers) {} + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry registry) {} + + @Override + public void onRuntimeAvailable(IJeiRuntime runtime) {} +} diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 706624156..a8b7132c5 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -19,6 +19,7 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -303,14 +304,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -319,14 +313,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", 10); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; @@ -335,21 +322,17 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public void setFluidStack(FluidStack fluidStack, Object... data) { - if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluid() == null) - { - return; - } - if(data[0] instanceof ItemStack) { ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) + + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluid() == null) { - itemStack.setTagCompound(new NBTTagCompound()); + ItemDataUtils.removeData(itemStack, "fluidTank"); + } + else { + ItemDataUtils.setCompound(itemStack, "fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); } - - itemStack.getTagCompound().setTag("fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); } } @@ -360,15 +343,12 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { ItemStack itemStack = (ItemStack)data[0]; - if(itemStack.getTagCompound() == null) + if(!ItemDataUtils.hasData(itemStack, "fluidTank")) { return null; } - if(itemStack.getTagCompound().hasKey("fluidTank")) - { - return FluidStack.loadFluidStackFromNBT(itemStack.getTagCompound().getCompoundTag("fluidTank")); - } + return FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(itemStack, "fluidTank")); } return null; @@ -383,24 +363,13 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override public void setEnergy(ItemStack itemStack, double amount) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override @@ -487,9 +456,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public String getOwner(ItemStack stack) { - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -498,40 +467,25 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public void setOwner(ItemStack stack, String owner) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return SecurityMode.PUBLIC; - } - - return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; + return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("security", mode.ordinal()); + ItemDataUtils.setInt(stack, "security", mode.ordinal()); } @Override diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index 0ed553c04..910394a8c 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -8,6 +8,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.item.ItemMekanism; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -103,17 +104,6 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem return false; } - @Override - public GasStack getGas(ItemStack itemstack) - { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - } - @Override public boolean showDurabilityBar(ItemStack stack) { @@ -126,23 +116,24 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + @Override + public GasStack getGas(ItemStack itemstack) + { + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); + } + @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index ba2e31dba..d5147ee7a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -9,6 +9,7 @@ import mekanism.common.FluidSlot; import mekanism.common.MekanismItems; import mekanism.common.base.ISustainedData; import mekanism.common.util.ChargeUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -309,12 +310,12 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui @Override public void writeSustainedData(ItemStack itemStack) { - itemStack.getTagCompound().setInteger("fluidStored", bioFuelSlot.fluidStored); + ItemDataUtils.setInt(itemStack, "fluidStored", bioFuelSlot.fluidStored); } @Override public void readSustainedData(ItemStack itemStack) { - bioFuelSlot.setFluid(itemStack.getTagCompound().getInteger("fluidStored")); + bioFuelSlot.setFluid(ItemDataUtils.getInt(itemStack, "fluidStored")); } } \ No newline at end of file diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 7a69a6b9c..c275c00e4 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -17,6 +17,7 @@ import mekanism.common.FuelHandler; import mekanism.common.FuelHandler.FuelGas; import mekanism.common.base.ISustainedData; import mekanism.common.util.ChargeUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -360,16 +361,16 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { if(fuelTank != null) { - itemStack.getTagCompound().setTag("fuelTank", fuelTank.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "fuelTank", fuelTank.write(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - if(itemStack.getTagCompound().hasKey("fuelTank")) + if(ItemDataUtils.hasData(itemStack, "fuelTank")) { - fuelTank.read(itemStack.getTagCompound().getCompoundTag("fuelTank")); + fuelTank.read(ItemDataUtils.getCompound(itemStack, "fuelTank")); boolean isTankEmpty = (fuelTank.getGas() == null); //Update energy output based on any existing fuel in tank diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 871397645..136e410f3 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -12,6 +12,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.HeatUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.init.Blocks; @@ -387,14 +388,14 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu { if(lavaTank.getFluid() != null) { - itemStack.getTagCompound().setTag("lavaTank", lavaTank.getFluid().writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "lavaTank", lavaTank.getFluid().writeToNBT(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - lavaTank.setFluid(FluidStack.loadFluidStackFromNBT(itemStack.getTagCompound().getCompoundTag("lavaTank"))); + lavaTank.setFluid(FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(itemStack, "lavaTank"))); } @Override From bdc071582fe089edd55495d67936fcb345718bad Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 19 May 2016 23:22:46 -0400 Subject: [PATCH 09/15] Loads of JEI work- got basic machine and advanced machine stuff mostly working, still need to do chance machines and everything else --- .../client/jei/BaseRecipeCategory.java | 172 ++++++++++++++++++ .../java/mekanism/client/jei/MekanismJEI.java | 98 +++++++++- .../ShapedMekanismRecipeHandler.java | 2 +- .../ShapedMekanismRecipeWrapper.java | 2 +- .../ShapelessMekanismRecipeHandler.java | 2 +- .../ShapelessMekanismRecipeWrapper.java | 2 +- .../client/jei/gas/GasStackHelper.java | 29 +++ .../AdvancedMachineRecipeCategory.java | 109 +++++++++++ .../machine/AdvancedMachineRecipeHandler.java | 46 +++++ .../machine/AdvancedMachineRecipeWrapper.java | 39 ++++ .../machine/ChanceMachineRecipeCategory.java | 5 + .../machine/ChanceMachineRecipeHandler.java | 5 + .../machine/ChanceMachineRecipeWrapper.java | 5 + .../jei/machine/MachineRecipeCategory.java | 90 +++++++++ .../jei/machine/MachineRecipeHandler.java | 46 +++++ .../jei/machine/MachineRecipeWrapper.java | 39 ++++ ...ChemicalInjectionChamberRecipeHandler.java | 12 ++ ...ChemicalInjectionChamberRecipeWrapper.java | 13 ++ .../advanced/CombinerRecipeHandler.java | 12 ++ .../advanced/CombinerRecipeWrapper.java | 13 ++ .../OsmiumCompressorRecipeHandler.java | 12 ++ .../OsmiumCompressorRecipeWrapper.java | 13 ++ .../PurificationChamberRecipeHandler.java | 12 ++ .../PurificationChamberRecipeWrapper.java | 13 ++ .../machine/basic/CrusherRecipeHandler.java | 12 ++ .../machine/basic/CrusherRecipeWrapper.java | 13 ++ .../basic/EnrichmentRecipeHandler.java | 12 ++ .../basic/EnrichmentRecipeWrapper.java | 13 ++ .../chance/PrecisionSawmillRecipeHandler.java | 5 + .../chance/PrecisionSawmillRecipeWrapper.java | 5 + .../recipe/inputs/AdvancedMachineInput.java | 1 + .../machines/AdvancedMachineRecipe.java | 1 - 32 files changed, 845 insertions(+), 8 deletions(-) create mode 100644 src/main/java/mekanism/client/jei/BaseRecipeCategory.java rename src/main/java/mekanism/client/jei/{ => crafting}/ShapedMekanismRecipeHandler.java (95%) rename src/main/java/mekanism/client/jei/{ => crafting}/ShapedMekanismRecipeWrapper.java (96%) rename src/main/java/mekanism/client/jei/{ => crafting}/ShapelessMekanismRecipeHandler.java (95%) rename src/main/java/mekanism/client/jei/{ => crafting}/ShapelessMekanismRecipeWrapper.java (96%) create mode 100644 src/main/java/mekanism/client/jei/gas/GasStackHelper.java create mode 100644 src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java diff --git a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java new file mode 100644 index 000000000..ba3588030 --- /dev/null +++ b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java @@ -0,0 +1,172 @@ +package mekanism.client.jei; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import mekanism.api.gas.GasStack; +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.MekanismRenderer.FluidType; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.IRecipeCategory; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + +public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper +{ + public static final GuiDummy gui = new GuiDummy(); + + public String recipeName; + public String unlocalizedName; + + public String guiTexture; + public ResourceLocation guiLocation; + + public ProgressBar progressBar; + + public BaseRecipeCategory(String gui, String name, String unlocalized, ProgressBar progress) + { + guiTexture = gui; + guiLocation = new ResourceLocation(guiTexture); + + progressBar = progress; + + recipeName = name; + unlocalizedName = unlocalized; + + addGuiElements(); + } + + @Override + public String getUid() + { + return "mekanism." + recipeName; + } + + @Override + public String getTitle() + { + return LangUtils.localize(unlocalizedName); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + changeTexture(guiLocation); + + for(GuiElement e : guiElements) + { + e.renderBackground(0, 0, -28, -16); + } + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void drawTexturedRect(int x, int y, int u, int v, int w, int h) + { + gui.drawTexturedModalRect(x, y, u, v, w, h); + } + + @Override + public void drawTexturedRectFromIcon(int x, int y, TextureAtlasSprite icon, int w, int h) + { + gui.drawTexturedModalRect(x, y, icon, w, h); + } + + @Override + public void displayTooltip(String s, int xAxis, int yAxis) {} + + @Override + public void displayTooltips(List list, int xAxis, int yAxis) {} + + @Override + public FontRenderer getFont() + { + return null; + } + + public void displayGauge(int length, int xPos, int yPos, int overlayX, int overlayY, int scale, FluidStack fluid, GasStack gas) + { + if(fluid == null && gas == null) + { + return; + } + + int start = 0; + + while(true) + { + int renderRemaining = 0; + + if(scale > 16) + { + renderRemaining = 16; + scale -= 16; + } + else { + renderRemaining = scale; + scale = 0; + } + + changeTexture(MekanismRenderer.getBlocksTexture()); + + if(fluid != null) + { + gui.drawTexturedModalRect(xPos, yPos + length - renderRemaining - start, MekanismRenderer.getFluidTexture(fluid.getFluid(), FluidType.STILL), 16, 16 - (16 - renderRemaining)); + } + else if(gas != null) + { + gui.drawTexturedModalRect(xPos, yPos + length - renderRemaining - start, gas.getGas().getSprite(), 16, 16 - (16 - renderRemaining)); + } + + start+=16; + + if(renderRemaining == 0 || scale == 0) + { + break; + } + } + + changeTexture(guiLocation); + gui.drawTexturedModalRect(xPos, yPos, overlayX, overlayY, 16, length+1); + } + + public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, GasStack gas) + { + if(gas == null) + { + return; + } + + changeTexture(MekanismRenderer.getBlocksTexture()); + gui.drawTexturedModalRect(xPos, yPos, gas.getGas().getSprite(), sizeX, sizeY); + } + + public String stripTexture() + { + return guiTexture.replace("mekanism:gui/", ""); + } + + public void changeTexture(ResourceLocation texture) + { + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + } + + public Set guiElements = new HashSet(); + + public void addGuiElements() {} + + public static class GuiDummy extends Gui {} +} diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 6fbc7782f..52b3896ab 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -1,7 +1,40 @@ package mekanism.client.jei; +import java.util.ArrayList; +import java.util.List; + +import mekanism.client.gui.GuiChemicalInjectionChamber; +import mekanism.client.gui.GuiCombiner; +import mekanism.client.gui.GuiCrusher; +import mekanism.client.gui.GuiEnrichmentChamber; +import mekanism.client.gui.GuiOsmiumCompressor; +import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.jei.crafting.ShapedMekanismRecipeHandler; +import mekanism.client.jei.crafting.ShapelessMekanismRecipeHandler; +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; +import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeHandler; +import mekanism.client.jei.machine.MachineRecipeWrapper; +import mekanism.client.jei.machine.advanced.ChemicalInjectionChamberRecipeHandler; +import mekanism.client.jei.machine.advanced.ChemicalInjectionChamberRecipeWrapper; +import mekanism.client.jei.machine.advanced.CombinerRecipeHandler; +import mekanism.client.jei.machine.advanced.CombinerRecipeWrapper; +import mekanism.client.jei.machine.advanced.OsmiumCompressorRecipeHandler; +import mekanism.client.jei.machine.advanced.OsmiumCompressorRecipeWrapper; +import mekanism.client.jei.machine.advanced.PurificationChamberRecipeHandler; +import mekanism.client.jei.machine.advanced.PurificationChamberRecipeWrapper; +import mekanism.client.jei.machine.basic.CrusherRecipeHandler; +import mekanism.client.jei.machine.basic.CrusherRecipeWrapper; +import mekanism.client.jei.machine.basic.EnrichmentRecipeHandler; +import mekanism.client.jei.machine.basic.EnrichmentRecipeWrapper; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.util.ItemDataUtils; import mezz.jei.api.IItemRegistry; import mezz.jei.api.IJeiHelpers; @@ -10,7 +43,6 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.IRecipeRegistry; import mezz.jei.api.JEIPlugin; -import mezz.jei.api.recipe.IRecipeHandler; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -24,8 +56,8 @@ public class MekanismJEI implements IModPlugin { registry.addAdvancedGuiHandlers(new GuiElementHandler()); - registry.addRecipeHandlers(new IRecipeHandler[] {new ShapedMekanismRecipeHandler()}); - registry.addRecipeHandlers(new IRecipeHandler[] {new ShapelessMekanismRecipeHandler()}); + registry.addRecipeHandlers(new ShapedMekanismRecipeHandler()); + registry.addRecipeHandlers(new ShapelessMekanismRecipeHandler()); registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(MekanismItems.ItemProxy)); registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(MekanismBlocks.BoundingBlock)); @@ -38,6 +70,66 @@ public class MekanismJEI implements IModPlugin registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), UNUSED_TAGS); registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.GasTank), UNUSED_TAGS); registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.CardboardBox), UNUSED_TAGS); + + try { + registerBasicMachine(registry, Recipe.ENRICHMENT_CHAMBER, "tile.MachineBlock.EnrichmentChamber.name", ProgressBar.BLUE, EnrichmentRecipeHandler.class, EnrichmentRecipeWrapper.class); + registerBasicMachine(registry, Recipe.CRUSHER, "tile.MachineBlock.Crusher.name", ProgressBar.CRUSH, CrusherRecipeHandler.class, CrusherRecipeWrapper.class); + + registerAdvancedMachine(registry, Recipe.COMBINER, "tile.MachineBlock.Combiner.name", ProgressBar.STONE, CombinerRecipeHandler.class, CombinerRecipeWrapper.class); + registerAdvancedMachine(registry, Recipe.PURIFICATION_CHAMBER, "tile.MachineBlock.PurificationChamber.name", ProgressBar.RED, PurificationChamberRecipeHandler.class, PurificationChamberRecipeWrapper.class); + registerAdvancedMachine(registry, Recipe.OSMIUM_COMPRESSOR, "tile.MachineBlock.OsmiumCompressor.name", ProgressBar.RED, OsmiumCompressorRecipeHandler.class, OsmiumCompressorRecipeWrapper.class); + registerAdvancedMachine(registry, Recipe.CHEMICAL_INJECTION_CHAMBER, "nei.chemicalInjectionChamber", ProgressBar.YELLOW, ChemicalInjectionChamberRecipeHandler.class, ChemicalInjectionChamberRecipeWrapper.class); + } catch(Exception e) { + e.printStackTrace(); + } + + registry.addRecipeClickArea(GuiEnrichmentChamber.class, 79, 40, 24, 7, "mekanism.enrichment_chamber"); + registry.addRecipeClickArea(GuiCrusher.class, 79, 40, 24, 7, "mekanism.crusher"); + + registry.addRecipeClickArea(GuiCombiner.class, 79, 40, 24, 7, "mekanism.combiner"); + registry.addRecipeClickArea(GuiPurificationChamber.class, 79, 40, 24, 7, "mekanism.purification_chamber"); + registry.addRecipeClickArea(GuiOsmiumCompressor.class, 79, 40, 24, 7, "mekanism.osmium_compressor"); + registry.addRecipeClickArea(GuiChemicalInjectionChamber.class, 79, 40, 24, 7, "mekanism:chemical_injection_chamber"); + } + + private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception + { + MachineRecipeCategory category = new MachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar); + + registry.addRecipeCategories(category); + registry.addRecipeHandlers(handler.getConstructor(MachineRecipeCategory.class).newInstance(category)); + + List recipes = new ArrayList(); + + for(Object obj : recipe.get().values()) + { + if(obj instanceof BasicMachineRecipe) + { + recipes.add(wrapper.getConstructor(BasicMachineRecipe.class, MachineRecipeCategory.class).newInstance((BasicMachineRecipe)obj, category)); + } + } + + registry.addRecipes(recipes); + } + + private void registerAdvancedMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception + { + AdvancedMachineRecipeCategory category = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar); + + registry.addRecipeCategories(category); + registry.addRecipeHandlers(handler.getConstructor(AdvancedMachineRecipeCategory.class).newInstance(category)); + + List recipes = new ArrayList(); + + for(Object obj : recipe.get().values()) + { + if(obj instanceof AdvancedMachineRecipe) + { + recipes.add(wrapper.getConstructor(AdvancedMachineRecipe.class, AdvancedMachineRecipeCategory.class).newInstance((AdvancedMachineRecipe)obj, category)); + } + } + + registry.addRecipes(recipes); } @Override diff --git a/src/main/java/mekanism/client/jei/ShapedMekanismRecipeHandler.java b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java similarity index 95% rename from src/main/java/mekanism/client/jei/ShapedMekanismRecipeHandler.java rename to src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java index 27625fa7c..93e7c0074 100644 --- a/src/main/java/mekanism/client/jei/ShapedMekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java @@ -1,4 +1,4 @@ -package mekanism.client.jei; +package mekanism.client.jei.crafting; import mekanism.common.recipe.ShapedMekanismRecipe; import mezz.jei.api.recipe.IRecipeHandler; diff --git a/src/main/java/mekanism/client/jei/ShapedMekanismRecipeWrapper.java b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeWrapper.java similarity index 96% rename from src/main/java/mekanism/client/jei/ShapedMekanismRecipeWrapper.java rename to src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeWrapper.java index 1f471480b..43dbf25b6 100644 --- a/src/main/java/mekanism/client/jei/ShapedMekanismRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeWrapper.java @@ -1,4 +1,4 @@ -package mekanism.client.jei; +package mekanism.client.jei.crafting; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeHandler.java b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeHandler.java similarity index 95% rename from src/main/java/mekanism/client/jei/ShapelessMekanismRecipeHandler.java rename to src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeHandler.java index 18f606830..882b070d5 100644 --- a/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeHandler.java @@ -1,4 +1,4 @@ -package mekanism.client.jei; +package mekanism.client.jei.crafting; import javax.annotation.Nonnull; diff --git a/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeWrapper.java b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java similarity index 96% rename from src/main/java/mekanism/client/jei/ShapelessMekanismRecipeWrapper.java rename to src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java index 7257e9f27..8344b2903 100644 --- a/src/main/java/mekanism/client/jei/ShapelessMekanismRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java @@ -1,4 +1,4 @@ -package mekanism.client.jei; +package mekanism.client.jei.crafting; import java.util.Collections; import java.util.List; diff --git a/src/main/java/mekanism/client/jei/gas/GasStackHelper.java b/src/main/java/mekanism/client/jei/gas/GasStackHelper.java new file mode 100644 index 000000000..06de01d44 --- /dev/null +++ b/src/main/java/mekanism/client/jei/gas/GasStackHelper.java @@ -0,0 +1,29 @@ +package mekanism.client.jei.gas; + + +public class GasStackHelper// implements IIngredientHelper +{ + /*@Override + public Collection expandSubtypes(Collection contained) { + return contained; + } + + @Override + public GasStack getMatch(Iterable ingredients, @Nonnull Focus toMatch) { + if (toMatch.getGas() == null) { + return null; + } + for (GasStack GasStack : ingredients) { + if (toMatch.getGas() == GasStack.getGas()) { + return GasStack; + } + } + return null; + } + + @Nonnull + @Override + public Focus createFocus(@Nonnull GasStack ingredient) { + return new Focus(ingredient.getGas()); + }*/ +} diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java new file mode 100644 index 000000000..33f6f4d98 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java @@ -0,0 +1,109 @@ +package mekanism.client.jei.machine; + +import mekanism.api.gas.GasStack; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.inputs.AdvancedMachineInput; +import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class AdvancedMachineRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public String recipeName; + public String unlocalizedName; + + public IDrawable background; + + public AdvancedMachineRecipe tempRecipe; + + public ITickTimer timer; + + public AdvancedMachineRecipeCategory(IGuiHelper helper, String name, String unlocalized, ProgressBar progress) + { + super("mekanism:gui/GuiAdvancedMachine.png", name, unlocalized, progress); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), 28, 16, 144, 54); + } + + @Override + public void addGuiElements() + { + guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 16)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 30, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52)); + guiElements.add(new GuiSlot(SlotType.OUTPUT_LARGE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30)); + + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return (double)timer.getValue() / 20F; + } + }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + AdvancedMachineInput input = (AdvancedMachineInput)tempRecipe.getInput(); + + if(input.gasType != null) + { + displayGauge(33, 21, 6, 12, new GasStack(input.gasType, 1)); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof AdvancedMachineRecipeWrapper) + { + tempRecipe = ((AdvancedMachineRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 27, 0); + itemStacks.init(1, false, 87, 18); + + itemStacks.setFromRecipe(0, recipeWrapper.getInputs()); + itemStacks.setFromRecipe(1, recipeWrapper.getOutputs()); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java new file mode 100644 index 000000000..4dbb889db --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java @@ -0,0 +1,46 @@ +package mekanism.client.jei.machine; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class AdvancedMachineRecipeHandler implements IRecipeHandler +{ + private final AdvancedMachineRecipeCategory category; + + public Class wrapperClass; + + public AdvancedMachineRecipeHandler(AdvancedMachineRecipeCategory c, Class wrapper) + { + category = c; + + wrapperClass = wrapper; + } + + @Override + public Class getRecipeClass() + { + return wrapperClass; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull T recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull T recipe) + { + return recipe.category == category; + } +} diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java new file mode 100644 index 000000000..e400d24a8 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java @@ -0,0 +1,39 @@ +package mekanism.client.jei.machine; + +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.inputs.AdvancedMachineInput; +import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.recipe.outputs.ItemStackOutput; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper +{ + public AdvancedMachineRecipe recipe; + + public AdvancedMachineRecipeCategory category; + + public AdvancedMachineRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(((AdvancedMachineInput)recipe.getInput()).itemStack); + } + + @Nonnull + @Override + public List getOutputs() + { + return Arrays.asList(((ItemStackOutput)recipe.getOutput()).output); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java new file mode 100644 index 000000000..9b6f183c8 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine; + +public class ChanceMachineRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java new file mode 100644 index 000000000..41435cd9e --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine; + +public class ChanceMachineRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java new file mode 100644 index 000000000..4b3274548 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine; + +public class ChanceMachineRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java new file mode 100644 index 000000000..5b41c8194 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java @@ -0,0 +1,90 @@ +package mekanism.client.jei.machine; + +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.BasicMachineRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.util.ResourceLocation; + +public class MachineRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public BasicMachineRecipe tempRecipe; + + public ITickTimer timer; + + public MachineRecipeCategory(IGuiHelper helper, String name, String unlocalized, ProgressBar progress) + { + super("mekanism:gui/GuiBasicMachine.png", name, unlocalized, progress); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), 28, 16, 144, 54); + } + + @Override + public void addGuiElements() + { + guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 16)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT_LARGE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30)); + + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return (double)timer.getValue() / 20F; + } + }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof MachineRecipeWrapper) + { + tempRecipe = ((MachineRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 27, 0); + itemStacks.init(1, false, 87, 18); + + itemStacks.setFromRecipe(0, recipeWrapper.getInputs()); + itemStacks.setFromRecipe(1, recipeWrapper.getOutputs()); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java new file mode 100644 index 000000000..a6431580a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java @@ -0,0 +1,46 @@ +package mekanism.client.jei.machine; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class MachineRecipeHandler implements IRecipeHandler +{ + private final MachineRecipeCategory category; + + public Class wrapperClass; + + public MachineRecipeHandler(MachineRecipeCategory c, Class wrapper) + { + category = c; + + wrapperClass = wrapper; + } + + @Override + public Class getRecipeClass() + { + return wrapperClass; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull T recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull T recipe) + { + return recipe.category == category; + } +} diff --git a/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java new file mode 100644 index 000000000..7cc872bdd --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java @@ -0,0 +1,39 @@ +package mekanism.client.jei.machine; + +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.inputs.ItemStackInput; +import mekanism.common.recipe.machines.BasicMachineRecipe; +import mekanism.common.recipe.outputs.ItemStackOutput; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class MachineRecipeWrapper extends BlankRecipeWrapper +{ + public BasicMachineRecipe recipe; + + public MachineRecipeCategory category; + + public MachineRecipeWrapper(BasicMachineRecipe r, MachineRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(((ItemStackInput)recipe.getInput()).ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + return Arrays.asList(((ItemStackOutput)recipe.getOutput()).output); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java new file mode 100644 index 000000000..6f4d0d573 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; + +public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipeHandler +{ + public ChemicalInjectionChamberRecipeHandler(AdvancedMachineRecipeCategory c) + { + super(c, ChemicalInjectionChamberRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java new file mode 100644 index 000000000..1f607dc46 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.common.recipe.machines.AdvancedMachineRecipe; + +public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipeWrapper +{ + public ChemicalInjectionChamberRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + super(r, c); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java new file mode 100644 index 000000000..109977634 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; + +public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler +{ + public CombinerRecipeHandler(AdvancedMachineRecipeCategory c) + { + super(c, CombinerRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java new file mode 100644 index 000000000..838e91e4a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.common.recipe.machines.AdvancedMachineRecipe; + +public class CombinerRecipeWrapper extends AdvancedMachineRecipeWrapper +{ + public CombinerRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + super(r, c); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java new file mode 100644 index 000000000..bc3d7bfec --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; + +public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler +{ + public OsmiumCompressorRecipeHandler(AdvancedMachineRecipeCategory c) + { + super(c, OsmiumCompressorRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java new file mode 100644 index 000000000..5e24c5bee --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.common.recipe.machines.AdvancedMachineRecipe; + +public class OsmiumCompressorRecipeWrapper extends AdvancedMachineRecipeWrapper +{ + public OsmiumCompressorRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + super(r, c); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java new file mode 100644 index 000000000..482c812e3 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; + +public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandler +{ + public PurificationChamberRecipeHandler(AdvancedMachineRecipeCategory c) + { + super(c, PurificationChamberRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java new file mode 100644 index 000000000..12e643471 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.common.recipe.machines.AdvancedMachineRecipe; + +public class PurificationChamberRecipeWrapper extends AdvancedMachineRecipeWrapper +{ + public PurificationChamberRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + super(r, c); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java new file mode 100644 index 000000000..bce25da89 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.basic; + +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeHandler; + +public class CrusherRecipeHandler extends MachineRecipeHandler +{ + public CrusherRecipeHandler(MachineRecipeCategory c) + { + super(c, CrusherRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeWrapper.java new file mode 100644 index 000000000..cd15ec112 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.basic; + +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeWrapper; +import mekanism.common.recipe.machines.BasicMachineRecipe; + +public class CrusherRecipeWrapper extends MachineRecipeWrapper +{ + public CrusherRecipeWrapper(BasicMachineRecipe r, MachineRecipeCategory c) + { + super(r, c); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java new file mode 100644 index 000000000..7b62a193d --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.basic; + +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeHandler; + +public class EnrichmentRecipeHandler extends MachineRecipeHandler +{ + public EnrichmentRecipeHandler(MachineRecipeCategory c) + { + super(c, EnrichmentRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeWrapper.java new file mode 100644 index 000000000..6333210a4 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.basic; + +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeWrapper; +import mekanism.common.recipe.machines.BasicMachineRecipe; + +public class EnrichmentRecipeWrapper extends MachineRecipeWrapper +{ + public EnrichmentRecipeWrapper(BasicMachineRecipe r, MachineRecipeCategory c) + { + super(r, c); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java new file mode 100644 index 000000000..c1ac25604 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chance; + +public class PrecisionSawmillRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java new file mode 100644 index 000000000..a69e95f17 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chance; + +public class PrecisionSawmillRecipeWrapper { + +} diff --git a/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java b/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java index 0cba3c79a..7725a1dbd 100644 --- a/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java @@ -83,6 +83,7 @@ public class AdvancedMachineInput extends MachineInput { return !other.isValid(); } + return StackUtils.equalsWildcardWithNBT(itemStack, other.itemStack) && gasType.getID() == other.gasType.getID(); } diff --git a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java index 06ca6782e..22bb16214 100644 --- a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java @@ -35,6 +35,5 @@ public abstract class AdvancedMachineRecipe Date: Fri, 20 May 2016 01:16:10 -0400 Subject: [PATCH 10/15] Added chance machine JEI support, added fuel display to advanced machine JEI handlers, add classes for remaining machinery --- .../java/mekanism/client/jei/MekanismJEI.java | 33 +++++- .../AdvancedMachineRecipeCategory.java | 4 + .../machine/AdvancedMachineRecipeWrapper.java | 21 +++- .../machine/ChanceMachineRecipeCategory.java | 100 +++++++++++++++++- .../machine/ChanceMachineRecipeHandler.java | 43 +++++++- .../machine/ChanceMachineRecipeWrapper.java | 52 ++++++++- ...ChemicalInjectionChamberRecipeWrapper.java | 37 +++++++ .../advanced/CombinerRecipeWrapper.java | 12 +++ .../OsmiumCompressorRecipeWrapper.java | 12 +++ .../PurificationChamberRecipeWrapper.java | 21 ++++ .../chance/PrecisionSawmillRecipeHandler.java | 9 +- .../chance/PrecisionSawmillRecipeWrapper.java | 10 +- .../ChemicalCrystallizerRecipeCategory.java | 5 + .../ChemicalCrystallizerRecipeHandler.java | 5 + .../ChemicalCrystallizerRecipeWrapper.java | 5 + ...micalDissolutionChamberRecipeCategory.java | 5 + ...emicalDissolutionChamberRecipeHandler.java | 5 + ...emicalDissolutionChamberRecipeWrapper.java | 5 + .../ChemicalInfuserRecipeCategory.java | 5 + .../ChemicalInfuserRecipeHandler.java | 5 + .../ChemicalInfuserRecipeWrapper.java | 5 + .../ChemicalOxidizerRecipeCategory.java | 5 + .../ChemicalOxidizerRecipeHandler.java | 5 + .../ChemicalOxidizerRecipeWrapper.java | 5 + .../ChemicalWasherRecipeCategory.java | 5 + .../chemical/ChemicalWasherRecipeHandler.java | 5 + .../chemical/ChemicalWasherRecipeWrapper.java | 5 + .../ElectrolyticSeparatorRecipeCategory.java | 5 + .../ElectrolyticSeparatorRecipeHandler.java | 5 + .../ElectrolyticSeparatorRecipeWrapper.java | 5 + .../MetallurgicInfuserRecipeCategory.java | 5 + .../MetallurgicInfuserRecipeHandler.java | 5 + .../MetallurgicInfuserRecipeWrapper.java | 5 + .../jei/machine/other/PRCRecipeCategory.java | 5 + .../jei/machine/other/PRCRecipeHandler.java | 5 + .../jei/machine/other/PRCRecipeWrapper.java | 5 + .../RotaryCondensentratorRecipeCategory.java | 5 + .../RotaryCondensentratorRecipeHandler.java | 5 + .../RotaryCondensentratorRecipeWrapper.java | 5 + .../other/SolarNeutronRecipeCategory.java | 5 + .../other/SolarNeutronRecipeHandler.java | 5 + .../other/SolarNeutronRecipeWrapper.java | 5 + .../ThermalEvaporationRecipeCategory.java | 5 + .../ThermalEvaporationRecipeHandler.java | 5 + .../ThermalEvaporationRecipeWrapper.java | 5 + .../mekanism/common/item/ItemBlockOre.java | 2 +- 46 files changed, 513 insertions(+), 8 deletions(-) create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 52b3896ab..e3391f7dd 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -8,6 +8,7 @@ import mekanism.client.gui.GuiCombiner; import mekanism.client.gui.GuiCrusher; import mekanism.client.gui.GuiEnrichmentChamber; import mekanism.client.gui.GuiOsmiumCompressor; +import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.jei.crafting.ShapedMekanismRecipeHandler; @@ -15,6 +16,9 @@ import mekanism.client.jei.crafting.ShapelessMekanismRecipeHandler; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.client.jei.machine.ChanceMachineRecipeCategory; +import mekanism.client.jei.machine.ChanceMachineRecipeHandler; +import mekanism.client.jei.machine.ChanceMachineRecipeWrapper; import mekanism.client.jei.machine.MachineRecipeCategory; import mekanism.client.jei.machine.MachineRecipeHandler; import mekanism.client.jei.machine.MachineRecipeWrapper; @@ -30,11 +34,14 @@ import mekanism.client.jei.machine.basic.CrusherRecipeHandler; import mekanism.client.jei.machine.basic.CrusherRecipeWrapper; import mekanism.client.jei.machine.basic.EnrichmentRecipeHandler; import mekanism.client.jei.machine.basic.EnrichmentRecipeWrapper; +import mekanism.client.jei.machine.chance.PrecisionSawmillRecipeHandler; +import mekanism.client.jei.machine.chance.PrecisionSawmillRecipeWrapper; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.machines.BasicMachineRecipe; +import mekanism.common.recipe.machines.ChanceMachineRecipe; import mekanism.common.util.ItemDataUtils; import mezz.jei.api.IItemRegistry; import mezz.jei.api.IJeiHelpers; @@ -79,6 +86,8 @@ public class MekanismJEI implements IModPlugin registerAdvancedMachine(registry, Recipe.PURIFICATION_CHAMBER, "tile.MachineBlock.PurificationChamber.name", ProgressBar.RED, PurificationChamberRecipeHandler.class, PurificationChamberRecipeWrapper.class); registerAdvancedMachine(registry, Recipe.OSMIUM_COMPRESSOR, "tile.MachineBlock.OsmiumCompressor.name", ProgressBar.RED, OsmiumCompressorRecipeHandler.class, OsmiumCompressorRecipeWrapper.class); registerAdvancedMachine(registry, Recipe.CHEMICAL_INJECTION_CHAMBER, "nei.chemicalInjectionChamber", ProgressBar.YELLOW, ChemicalInjectionChamberRecipeHandler.class, ChemicalInjectionChamberRecipeWrapper.class); + + registerChanceMachine(registry, Recipe.PRECISION_SAWMILL, "tile.MachineBlock2.PrecisionSawmill.name", ProgressBar.PURPLE, PrecisionSawmillRecipeHandler.class, PrecisionSawmillRecipeWrapper.class); } catch(Exception e) { e.printStackTrace(); } @@ -89,7 +98,9 @@ public class MekanismJEI implements IModPlugin registry.addRecipeClickArea(GuiCombiner.class, 79, 40, 24, 7, "mekanism.combiner"); registry.addRecipeClickArea(GuiPurificationChamber.class, 79, 40, 24, 7, "mekanism.purification_chamber"); registry.addRecipeClickArea(GuiOsmiumCompressor.class, 79, 40, 24, 7, "mekanism.osmium_compressor"); - registry.addRecipeClickArea(GuiChemicalInjectionChamber.class, 79, 40, 24, 7, "mekanism:chemical_injection_chamber"); + registry.addRecipeClickArea(GuiChemicalInjectionChamber.class, 79, 40, 24, 7, "mekanism.chemical_injection_chamber"); + + registry.addRecipeClickArea(GuiPrecisionSawmill.class, 79, 40, 24, 7, "mekanism.precision_sawmill"); } private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception @@ -132,6 +143,26 @@ public class MekanismJEI implements IModPlugin registry.addRecipes(recipes); } + private void registerChanceMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception + { + ChanceMachineRecipeCategory category = new ChanceMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar); + + registry.addRecipeCategories(category); + registry.addRecipeHandlers(handler.getConstructor(ChanceMachineRecipeCategory.class).newInstance(category)); + + List recipes = new ArrayList(); + + for(Object obj : recipe.get().values()) + { + if(obj instanceof ChanceMachineRecipe) + { + recipes.add(wrapper.getConstructor(ChanceMachineRecipe.class, ChanceMachineRecipeCategory.class).newInstance((ChanceMachineRecipe)obj, category)); + } + } + + registry.addRecipes(recipes); + } + @Override public void onItemRegistryAvailable(IItemRegistry registry) {} diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java index 33f6f4d98..12ab12557 100644 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java @@ -98,12 +98,16 @@ public class AdvancedMachineRecipeCategory extends BaseRecipeCategory tempRecipe = ((AdvancedMachineRecipeWrapper)recipeWrapper).recipe; } + AdvancedMachineInput input = (AdvancedMachineInput)tempRecipe.recipeInput; + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); itemStacks.init(0, true, 27, 0); itemStacks.init(1, false, 87, 18); + itemStacks.init(2, false, 27, 36); itemStacks.setFromRecipe(0, recipeWrapper.getInputs()); itemStacks.setFromRecipe(1, recipeWrapper.getOutputs()); + itemStacks.set(2, ((AdvancedMachineRecipeWrapper)recipeWrapper).getFuelStacks(input.gasType)); } } diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java index e400d24a8..aea384250 100644 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java @@ -1,17 +1,20 @@ package mekanism.client.jei.machine; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import mekanism.api.gas.Gas; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -public class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper +public abstract class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper { public AdvancedMachineRecipe recipe; @@ -36,4 +39,20 @@ public class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper { return Arrays.asList(((ItemStackOutput)recipe.getOutput()).output); } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 33 && mouseX <= 39 && mouseY >= 22 && mouseY <= 34) + { + currenttip.add(((AdvancedMachineInput)recipe.getInput()).gasType.getLocalizedName()); + } + + return currenttip; + } + + public abstract List getFuelStacks(Gas gasType); } diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java index 9b6f183c8..3bf0f6948 100644 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java @@ -1,5 +1,103 @@ package mekanism.client.jei.machine; -public class ChanceMachineRecipeCategory { +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.ChanceMachineRecipe; +import mekanism.common.recipe.outputs.ChanceOutput; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.util.ResourceLocation; +public class ChanceMachineRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public ChanceMachineRecipe tempRecipe; + + public ITickTimer timer; + + public ChanceMachineRecipeCategory(IGuiHelper helper, String name, String unlocalized, ProgressBar progress) + { + super("mekanism:gui/GuiBasicMachine.png", name, unlocalized, progress); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), 28, 16, 144, 54); + } + + @Override + public void addGuiElements() + { + guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 16)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT_WIDE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30)); + + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return (double)timer.getValue() / 20F; + } + }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChanceMachineRecipeWrapper) + { + tempRecipe = ((ChanceMachineRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 27, 0); + itemStacks.init(1, false, 87, 18); + itemStacks.init(2, false, 103, 18); + + itemStacks.setFromRecipe(0, recipeWrapper.getInputs()); + + ChanceOutput output = (ChanceOutput)tempRecipe.getOutput(); + + if(output.hasPrimary()) + { + itemStacks.setFromRecipe(1, output.primaryOutput); + } + + if(output.hasSecondary()) + { + itemStacks.set(2, output.secondaryOutput); + } + } } diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java index 41435cd9e..170b7969f 100644 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java @@ -1,5 +1,46 @@ package mekanism.client.jei.machine; -public class ChanceMachineRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChanceMachineRecipeHandler implements IRecipeHandler +{ + private final ChanceMachineRecipeCategory category; + + public Class wrapperClass; + + public ChanceMachineRecipeHandler(ChanceMachineRecipeCategory c, Class wrapper) + { + category = c; + + wrapperClass = wrapper; + } + + @Override + public Class getRecipeClass() + { + return wrapperClass; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull T recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull T recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java index 4b3274548..a32363c46 100644 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java @@ -1,5 +1,55 @@ package mekanism.client.jei.machine; -public class ChanceMachineRecipeWrapper { +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; + +import mekanism.common.recipe.inputs.ItemStackInput; +import mekanism.common.recipe.machines.ChanceMachineRecipe; +import mekanism.common.recipe.outputs.ChanceOutput; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; + +public class ChanceMachineRecipeWrapper extends BlankRecipeWrapper +{ + public ChanceMachineRecipe recipe; + + public ChanceMachineRecipeCategory category; + + public ChanceMachineRecipeWrapper(ChanceMachineRecipe r, ChanceMachineRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(((ItemStackInput)recipe.getInput()).ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + ChanceOutput output = (ChanceOutput)recipe.getOutput(); + + return Arrays.asList(output.primaryOutput, output.secondaryOutput); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) + { + ChanceOutput output = (ChanceOutput)recipe.getOutput(); + + if(output.hasSecondary()) + { + FontRenderer fontRendererObj = minecraft.fontRendererObj; + fontRendererObj.drawString(Math.round(output.secondaryChance*100) + "%", 104, 41, 0x404040, false); + } + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java index 1f607dc46..747a64cb6 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java @@ -1,8 +1,18 @@ package mekanism.client.jei.machine.advanced; +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.util.MekanismUtils; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipeWrapper { @@ -10,4 +20,31 @@ public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipe { super(r, c); } + + @Override + public List getFuelStacks(Gas gasType) + { + if(gasType == GasRegistry.getGas("sulfuricAcid")) + { + List fuels = new ArrayList(); + fuels.addAll(OreDictionary.getOres("dustSulfur")); + fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("sulfuricAcid"))); + + return fuels; + } + else if(gasType == GasRegistry.getGas("water")) + { + return ListUtils.asList(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("water"))); + } + else if(gasType == GasRegistry.getGas("hydrogenChloride")) + { + List fuels = new ArrayList(); + fuels.addAll(OreDictionary.getOres("dustSalt")); + fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("hydrogenChloride"))); + + return fuels; + } + + return new ArrayList(); + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java index 838e91e4a..e77fc03e7 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java @@ -1,8 +1,14 @@ package mekanism.client.jei.machine.advanced; +import java.util.List; + +import mekanism.api.gas.Gas; +import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; public class CombinerRecipeWrapper extends AdvancedMachineRecipeWrapper { @@ -10,4 +16,10 @@ public class CombinerRecipeWrapper extends AdvancedMachineRecipeWrapper { super(r, c); } + + @Override + public List getFuelStacks(Gas gasType) + { + return ListUtils.asList(new ItemStack(Blocks.cobblestone)); + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java index 5e24c5bee..bb4acf946 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java @@ -1,8 +1,14 @@ package mekanism.client.jei.machine.advanced; +import java.util.List; + +import mekanism.api.gas.Gas; +import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.common.MekanismItems; import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipeWrapper extends AdvancedMachineRecipeWrapper { @@ -10,4 +16,10 @@ public class OsmiumCompressorRecipeWrapper extends AdvancedMachineRecipeWrapper { super(r, c); } + + @Override + public List getFuelStacks(Gas gasType) + { + return ListUtils.asList(new ItemStack(MekanismItems.Ingot, 1, 1)); + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java index 12e643471..ac64e6c51 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java @@ -1,8 +1,18 @@ package mekanism.client.jei.machine.advanced; +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.util.MekanismUtils; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; public class PurificationChamberRecipeWrapper extends AdvancedMachineRecipeWrapper { @@ -10,4 +20,15 @@ public class PurificationChamberRecipeWrapper extends AdvancedMachineRecipeWrapp { super(r, c); } + + @Override + public List getFuelStacks(Gas gasType) + { + if(gasType == GasRegistry.getGas("oxygen")) + { + return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("oxygen"))); + } + + return new ArrayList(); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java index c1ac25604..f97cb37d2 100644 --- a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java @@ -1,5 +1,12 @@ package mekanism.client.jei.machine.chance; -public class PrecisionSawmillRecipeHandler { +import mekanism.client.jei.machine.ChanceMachineRecipeCategory; +import mekanism.client.jei.machine.ChanceMachineRecipeHandler; +public class PrecisionSawmillRecipeHandler extends ChanceMachineRecipeHandler +{ + public PrecisionSawmillRecipeHandler(ChanceMachineRecipeCategory c) + { + super(c, PrecisionSawmillRecipeWrapper.class); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java index a69e95f17..145251061 100644 --- a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java @@ -1,5 +1,13 @@ package mekanism.client.jei.machine.chance; -public class PrecisionSawmillRecipeWrapper { +import mekanism.client.jei.machine.ChanceMachineRecipeCategory; +import mekanism.client.jei.machine.ChanceMachineRecipeWrapper; +import mekanism.common.recipe.machines.ChanceMachineRecipe; +public class PrecisionSawmillRecipeWrapper extends ChanceMachineRecipeWrapper +{ + public PrecisionSawmillRecipeWrapper(ChanceMachineRecipe r, ChanceMachineRecipeCategory c) + { + super(r, c); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java new file mode 100644 index 000000000..7bdf54b65 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalCrystallizerRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java new file mode 100644 index 000000000..e7354081f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalCrystallizerRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java new file mode 100644 index 000000000..b5de46677 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalCrystallizerRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java new file mode 100644 index 000000000..2d1003f9b --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalDissolutionChamberRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java new file mode 100644 index 000000000..094c66a93 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalDissolutionChamberRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java new file mode 100644 index 000000000..622f3064a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalDissolutionChamberRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java new file mode 100644 index 000000000..8aff84977 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalInfuserRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java new file mode 100644 index 000000000..496c5e426 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalInfuserRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java new file mode 100644 index 000000000..50565f8cc --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalInfuserRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java new file mode 100644 index 000000000..9d1f4d574 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalOxidizerRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java new file mode 100644 index 000000000..30e08db65 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalOxidizerRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java new file mode 100644 index 000000000..d88ab5c4e --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalOxidizerRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java new file mode 100644 index 000000000..a2798addb --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalWasherRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java new file mode 100644 index 000000000..035340d57 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalWasherRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java new file mode 100644 index 000000000..aa7697db5 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalWasherRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java new file mode 100644 index 000000000..2823fec6f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ElectrolyticSeparatorRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java new file mode 100644 index 000000000..70f2a856d --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ElectrolyticSeparatorRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java new file mode 100644 index 000000000..eaf6265a2 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ElectrolyticSeparatorRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java new file mode 100644 index 000000000..760f8672a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class MetallurgicInfuserRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java new file mode 100644 index 000000000..2f9624df7 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class MetallurgicInfuserRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java new file mode 100644 index 000000000..56ed41cf4 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class MetallurgicInfuserRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java new file mode 100644 index 000000000..86c070caf --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class PRCRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java new file mode 100644 index 000000000..2ee616dfa --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class PRCRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java new file mode 100644 index 000000000..2a121a327 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class PRCRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java new file mode 100644 index 000000000..180c56f51 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class RotaryCondensentratorRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java new file mode 100644 index 000000000..7b0a91bd2 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class RotaryCondensentratorRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java new file mode 100644 index 000000000..646d0f306 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class RotaryCondensentratorRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java new file mode 100644 index 000000000..1d6387b7d --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class SolarNeutronRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java new file mode 100644 index 000000000..d065f8db9 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class SolarNeutronRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java new file mode 100644 index 000000000..c2a7c1b3c --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class SolarNeutronRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java new file mode 100644 index 000000000..b20fbc22f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ThermalEvaporationRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java new file mode 100644 index 000000000..3d0cd7afd --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ThermalEvaporationRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java new file mode 100644 index 000000000..ec4e23964 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ThermalEvaporationRecipeWrapper { + +} diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 16b71a1b5..5e53c59d0 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -40,7 +40,7 @@ public class ItemBlockOre extends ItemBlock { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + LangUtils.localize("tooltip.forDetails") + "."); + list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")), itemstack)); From 261a32ee0134b06c904e2fb88529ae2b5f97828a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 20 May 2016 11:13:01 -0400 Subject: [PATCH 11/15] Fixed slurry gas sprites, add chemical machine JEI handlers, start work on remaining machines --- src/main/java/mekanism/api/gas/Gas.java | 18 ++- .../client/jei/BaseRecipeCategory.java | 5 +- .../java/mekanism/client/jei/MekanismJEI.java | 119 ++++++++++++---- .../ChemicalCrystallizerRecipeCategory.java | 72 +++++++++- .../ChemicalCrystallizerRecipeHandler.java | 39 +++++- .../ChemicalCrystallizerRecipeWrapper.java | 52 ++++++- ...micalDissolutionChamberRecipeCategory.java | 75 ++++++++++- ...emicalDissolutionChamberRecipeHandler.java | 39 +++++- ...emicalDissolutionChamberRecipeWrapper.java | 56 +++++++- .../ChemicalInfuserRecipeCategory.java | 72 +++++++++- .../ChemicalInfuserRecipeHandler.java | 39 +++++- .../ChemicalInfuserRecipeWrapper.java | 58 +++++++- .../ChemicalOxidizerRecipeCategory.java | 95 ++++++++++++- .../ChemicalOxidizerRecipeHandler.java | 39 +++++- .../ChemicalOxidizerRecipeWrapper.java | 52 ++++++- .../ChemicalWasherRecipeCategory.java | 76 ++++++++++- .../chemical/ChemicalWasherRecipeHandler.java | 39 +++++- .../chemical/ChemicalWasherRecipeWrapper.java | 64 ++++++++- .../ElectrolyticSeparatorRecipeWrapper.java | 63 ++++++++- .../MetallurgicInfuserRecipeCategory.java | 127 +++++++++++++++++- .../MetallurgicInfuserRecipeHandler.java | 39 +++++- .../MetallurgicInfuserRecipeWrapper.java | 39 +++++- .../jei/machine/other/PRCRecipeWrapper.java | 64 ++++++++- .../other/SolarNeutronRecipeWrapper.java | 54 +++++++- .../ThermalEvaporationRecipeWrapper.java | 34 ++++- .../client/render/MekanismRenderer.java | 7 +- src/main/java/mekanism/common/Mekanism.java | 2 - .../mekanism/gui/GuiAdvancedMachine.png | Bin 1844 -> 15859 bytes .../mekanism/gui/GuiChemicalOxidizer.png | Bin 2724 -> 16833 bytes 29 files changed, 1381 insertions(+), 57 deletions(-) diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index a712432ed..2de9e55f9 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -136,7 +136,7 @@ public class Gas { return MekanismRenderer.getFluidTexture(fluid, FluidType.STILL); } - + return sprite; } @@ -145,13 +145,25 @@ public class Gas * @param i - IIcon to associate with this Gas * @return this Gas object */ - public Gas updateIcon(TextureMap map) + public Gas registerIcon(TextureMap map) { - sprite = map.registerSprite(iconLocation); + map.registerSprite(iconLocation); from_fluid = false; return this; } + + public Gas updateIcon(TextureMap map) + { + TextureAtlasSprite tex = map.getTextureExtry(iconLocation.toString()); + + if(tex != null) + { + sprite = tex; + } + System.out.println(sprite); + return this; + } /** * Gets the ID associated with this gas. diff --git a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java index ba3588030..ebf8eb421 100644 --- a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java @@ -33,6 +33,9 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper public ProgressBar progressBar; + public int xOffset = 28; + public int yOffset = 16; + public BaseRecipeCategory(String gui, String name, String unlocalized, ProgressBar progress) { guiTexture = gui; @@ -66,7 +69,7 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper for(GuiElement e : guiElements) { - e.renderBackground(0, 0, -28, -16); + e.renderBackground(0, 0, -xOffset, -yOffset); } } diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index e3391f7dd..785169c58 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -3,13 +3,24 @@ package mekanism.client.jei; import java.util.ArrayList; import java.util.List; +import mekanism.client.gui.GuiChemicalCrystallizer; +import mekanism.client.gui.GuiChemicalDissolutionChamber; +import mekanism.client.gui.GuiChemicalInfuser; import mekanism.client.gui.GuiChemicalInjectionChamber; +import mekanism.client.gui.GuiChemicalOxidizer; +import mekanism.client.gui.GuiChemicalWasher; import mekanism.client.gui.GuiCombiner; import mekanism.client.gui.GuiCrusher; +import mekanism.client.gui.GuiElectrolyticSeparator; import mekanism.client.gui.GuiEnrichmentChamber; +import mekanism.client.gui.GuiMetallurgicInfuser; import mekanism.client.gui.GuiOsmiumCompressor; +import mekanism.client.gui.GuiPRC; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.GuiRotaryCondensentrator; +import mekanism.client.gui.GuiSolarNeutronActivator; +import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.jei.crafting.ShapedMekanismRecipeHandler; import mekanism.client.jei.crafting.ShapelessMekanismRecipeHandler; @@ -36,12 +47,37 @@ import mekanism.client.jei.machine.basic.EnrichmentRecipeHandler; import mekanism.client.jei.machine.basic.EnrichmentRecipeWrapper; import mekanism.client.jei.machine.chance.PrecisionSawmillRecipeHandler; import mekanism.client.jei.machine.chance.PrecisionSawmillRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalCrystallizerRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalCrystallizerRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalCrystallizerRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeWrapper; +import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeCategory; +import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeHandler; +import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeWrapper; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.recipe.machines.ChanceMachineRecipe; +import mekanism.common.recipe.machines.ChemicalInfuserRecipe; +import mekanism.common.recipe.machines.CrystallizerRecipe; +import mekanism.common.recipe.machines.DissolutionRecipe; +import mekanism.common.recipe.machines.MachineRecipe; +import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.recipe.machines.WasherRecipe; import mekanism.common.util.ItemDataUtils; import mezz.jei.api.IItemRegistry; import mezz.jei.api.IJeiHelpers; @@ -50,6 +86,8 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.IRecipeRegistry; import mezz.jei.api.JEIPlugin; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -88,19 +126,59 @@ public class MekanismJEI implements IModPlugin registerAdvancedMachine(registry, Recipe.CHEMICAL_INJECTION_CHAMBER, "nei.chemicalInjectionChamber", ProgressBar.YELLOW, ChemicalInjectionChamberRecipeHandler.class, ChemicalInjectionChamberRecipeWrapper.class); registerChanceMachine(registry, Recipe.PRECISION_SAWMILL, "tile.MachineBlock2.PrecisionSawmill.name", ProgressBar.PURPLE, PrecisionSawmillRecipeHandler.class, PrecisionSawmillRecipeWrapper.class); + + MetallurgicInfuserRecipeCategory metallurgicInfuserCategory = new MetallurgicInfuserRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(metallurgicInfuserCategory); + registry.addRecipeHandlers(new MetallurgicInfuserRecipeHandler(metallurgicInfuserCategory)); + addRecipes(registry, Recipe.METALLURGIC_INFUSER, metallurgicInfuserCategory, MetallurgicInfuserRecipe.class, MetallurgicInfuserRecipeCategory.class, MetallurgicInfuserRecipeWrapper.class); + + ChemicalCrystallizerRecipeCategory chemicalCrystallizerCategory = new ChemicalCrystallizerRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalCrystallizerCategory); + registry.addRecipeHandlers(new ChemicalCrystallizerRecipeHandler(chemicalCrystallizerCategory)); + addRecipes(registry, Recipe.CHEMICAL_CRYSTALLIZER, chemicalCrystallizerCategory, CrystallizerRecipe.class, ChemicalCrystallizerRecipeCategory.class, ChemicalCrystallizerRecipeWrapper.class); + + ChemicalDissolutionChamberRecipeCategory chemicalDissolutionChamberCategory = new ChemicalDissolutionChamberRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalDissolutionChamberCategory); + registry.addRecipeHandlers(new ChemicalDissolutionChamberRecipeHandler(chemicalDissolutionChamberCategory)); + addRecipes(registry, Recipe.CHEMICAL_DISSOLUTION_CHAMBER, chemicalDissolutionChamberCategory, DissolutionRecipe.class, ChemicalDissolutionChamberRecipeCategory.class, ChemicalDissolutionChamberRecipeWrapper.class); + + ChemicalInfuserRecipeCategory chemicalInfuserCategory = new ChemicalInfuserRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalInfuserCategory); + registry.addRecipeHandlers(new ChemicalInfuserRecipeHandler(chemicalInfuserCategory)); + addRecipes(registry, Recipe.CHEMICAL_INFUSER, chemicalInfuserCategory, ChemicalInfuserRecipe.class, ChemicalInfuserRecipeCategory.class, ChemicalInfuserRecipeWrapper.class); + + ChemicalOxidizerRecipeCategory chemicalOxidizerCategory = new ChemicalOxidizerRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalOxidizerCategory); + registry.addRecipeHandlers(new ChemicalOxidizerRecipeHandler(chemicalOxidizerCategory)); + addRecipes(registry, Recipe.CHEMICAL_OXIDIZER, chemicalOxidizerCategory, OxidationRecipe.class, ChemicalOxidizerRecipeCategory.class, ChemicalOxidizerRecipeWrapper.class); + + ChemicalWasherRecipeCategory chemicalWasherCategory = new ChemicalWasherRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalWasherCategory); + registry.addRecipeHandlers(new ChemicalWasherRecipeHandler(chemicalWasherCategory)); + addRecipes(registry, Recipe.CHEMICAL_WASHER, chemicalWasherCategory, WasherRecipe.class, ChemicalWasherRecipeCategory.class, ChemicalWasherRecipeWrapper.class); } catch(Exception e) { e.printStackTrace(); } registry.addRecipeClickArea(GuiEnrichmentChamber.class, 79, 40, 24, 7, "mekanism.enrichment_chamber"); registry.addRecipeClickArea(GuiCrusher.class, 79, 40, 24, 7, "mekanism.crusher"); - registry.addRecipeClickArea(GuiCombiner.class, 79, 40, 24, 7, "mekanism.combiner"); registry.addRecipeClickArea(GuiPurificationChamber.class, 79, 40, 24, 7, "mekanism.purification_chamber"); registry.addRecipeClickArea(GuiOsmiumCompressor.class, 79, 40, 24, 7, "mekanism.osmium_compressor"); registry.addRecipeClickArea(GuiChemicalInjectionChamber.class, 79, 40, 24, 7, "mekanism.chemical_injection_chamber"); - registry.addRecipeClickArea(GuiPrecisionSawmill.class, 79, 40, 24, 7, "mekanism.precision_sawmill"); + registry.addRecipeClickArea(GuiMetallurgicInfuser.class, 72, 47, 32, 8, "mekanism.metallurgic_infuser"); + registry.addRecipeClickArea(GuiChemicalCrystallizer.class, 53, 62, 48, 8, "mekanism.chemical_crystallizer"); + registry.addRecipeClickArea(GuiChemicalDissolutionChamber.class, 64, 40, 48, 8, "mekanism.chemical_dissolution_chamber"); + registry.addRecipeClickArea(GuiChemicalInfuser.class, 47, 39, 28, 8, "mekanism.chemical_infuser"); + registry.addRecipeClickArea(GuiChemicalInfuser.class, 101, 39, 28, 8, "mekanism.chemical_infuser"); + registry.addRecipeClickArea(GuiChemicalOxidizer.class, 64, 40, 48, 8, "mekanism.chemical_oxidizer"); + registry.addRecipeClickArea(GuiChemicalWasher.class, 61, 39, 55, 8, "mekanism.chemical_washer"); + registry.addRecipeClickArea(GuiSolarNeutronActivator.class, 64, 39, 48, 8, "mekanism.solar_neutron_activator"); + registry.addRecipeClickArea(GuiElectrolyticSeparator.class, 80, 30, 16, 6, "mekanism.electrolytic_separator"); + registry.addRecipeClickArea(GuiThermalEvaporationController.class, 49, 20, 78, 38, "mekanism.thermal_evaporation_plant"); + registry.addRecipeClickArea(GuiPRC.class, 75, 37, 36, 10, "mekanism.pressurized_reaction_chamber"); + registry.addRecipeClickArea(GuiRotaryCondensentrator.class, 64, 39, 48, 8, "mekanism.rotary_condensentrator"); } private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception @@ -110,17 +188,7 @@ public class MekanismJEI implements IModPlugin registry.addRecipeCategories(category); registry.addRecipeHandlers(handler.getConstructor(MachineRecipeCategory.class).newInstance(category)); - List recipes = new ArrayList(); - - for(Object obj : recipe.get().values()) - { - if(obj instanceof BasicMachineRecipe) - { - recipes.add(wrapper.getConstructor(BasicMachineRecipe.class, MachineRecipeCategory.class).newInstance((BasicMachineRecipe)obj, category)); - } - } - - registry.addRecipes(recipes); + addRecipes(registry, recipe, category, BasicMachineRecipe.class, MachineRecipeCategory.class, wrapper); } private void registerAdvancedMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception @@ -130,17 +198,7 @@ public class MekanismJEI implements IModPlugin registry.addRecipeCategories(category); registry.addRecipeHandlers(handler.getConstructor(AdvancedMachineRecipeCategory.class).newInstance(category)); - List recipes = new ArrayList(); - - for(Object obj : recipe.get().values()) - { - if(obj instanceof AdvancedMachineRecipe) - { - recipes.add(wrapper.getConstructor(AdvancedMachineRecipe.class, AdvancedMachineRecipeCategory.class).newInstance((AdvancedMachineRecipe)obj, category)); - } - } - - registry.addRecipes(recipes); + addRecipes(registry, recipe, category, AdvancedMachineRecipe.class, AdvancedMachineRecipeCategory.class, wrapper); } private void registerChanceMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception @@ -150,13 +208,18 @@ public class MekanismJEI implements IModPlugin registry.addRecipeCategories(category); registry.addRecipeHandlers(handler.getConstructor(ChanceMachineRecipeCategory.class).newInstance(category)); - List recipes = new ArrayList(); + addRecipes(registry, recipe, category, ChanceMachineRecipe.class, ChanceMachineRecipeCategory.class, wrapper); + } + + private void addRecipes(IModRegistry registry, Recipe type, IRecipeCategory cat, Class recipe, Class category, Class wrapper) throws Exception + { + List recipes = new ArrayList(); - for(Object obj : recipe.get().values()) + for(Object obj : type.get().values()) { - if(obj instanceof ChanceMachineRecipe) + if(obj instanceof MachineRecipe) { - recipes.add(wrapper.getConstructor(ChanceMachineRecipe.class, ChanceMachineRecipeCategory.class).newInstance((ChanceMachineRecipe)obj, category)); + recipes.add(wrapper.getConstructor(recipe, category).newInstance(obj, cat)); } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java index 7bdf54b65..8b3749745 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java @@ -1,5 +1,75 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalCrystallizerRecipeCategory { +import mekanism.api.gas.GasStack; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.CrystallizerRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class ChemicalCrystallizerRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public CrystallizerRecipe tempRecipe; + + public ITickTimer timer; + + public ChemicalCrystallizerRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiChemicalCrystallizer.png", "chemical_crystallizer", "tile.MachineBlock2.ChemicalCrystallizer.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 5; + yOffset = 3; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 147, 79); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + GasStack gas = tempRecipe.getInput().ingredient; + + float f = (float)timer.getValue() / 20F; + drawTexturedRect(53-xOffset, 61-yOffset, 176, 63, (int)(48*f), 8); + + if(gas != null) + { + displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, gas); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalCrystallizerRecipeWrapper) + { + tempRecipe = ((ChemicalCrystallizerRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, false, 130-xOffset, 56-yOffset); + + itemStacks.set(0, tempRecipe.getOutput().output); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java index e7354081f..7b9c69531 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalCrystallizerRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalCrystallizerRecipeHandler implements IRecipeHandler +{ + private final ChemicalCrystallizerRecipeCategory category; + + public ChemicalCrystallizerRecipeHandler(ChemicalCrystallizerRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalCrystallizerRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalCrystallizerRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalCrystallizerRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java index b5de46677..2bd77b778 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java @@ -1,5 +1,55 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalCrystallizerRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.inputs.AdvancedMachineInput; +import mekanism.common.recipe.machines.CrystallizerRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ChemicalCrystallizerRecipeWrapper extends BlankRecipeWrapper +{ + public CrystallizerRecipe recipe; + + public ChemicalCrystallizerRecipeCategory category; + + public ChemicalCrystallizerRecipeWrapper(CrystallizerRecipe r, ChemicalCrystallizerRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getOutputs() + { + return Arrays.asList(recipe.getOutput().output); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 1 && mouseX <= 17 && mouseY >= 5-3 && mouseY <= 63-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java index 2d1003f9b..dc9d631b0 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java @@ -1,5 +1,78 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalDissolutionChamberRecipeCategory { +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.DissolutionRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class ChemicalDissolutionChamberRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public DissolutionRecipe tempRecipe; + + public ITickTimer timer; + + public ChemicalDissolutionChamberRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiChemicalDissolutionChamber.png", "chemical_dissolution_chamber", "gui.chemicalDissolutionChamber.short", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 3; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 79); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + GasStack gas = tempRecipe.getOutput().output; + + float f = (float)timer.getValue() / 20F; + drawTexturedRect(64-xOffset, 40-yOffset, 176, 63, (int)(48*f), 8); + + displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, new GasStack(GasRegistry.getGas("sulfuricAcid"), 1)); + + if(gas != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, gas); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalDissolutionChamberRecipeWrapper) + { + tempRecipe = ((ChemicalDissolutionChamberRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 25-xOffset, 35-yOffset); + + itemStacks.set(0, tempRecipe.getInput().ingredient); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java index 094c66a93..680b1277e 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalDissolutionChamberRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalDissolutionChamberRecipeHandler implements IRecipeHandler +{ + private final ChemicalDissolutionChamberRecipeCategory category; + + public ChemicalDissolutionChamberRecipeHandler(ChemicalDissolutionChamberRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalDissolutionChamberRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalDissolutionChamberRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalDissolutionChamberRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java index 622f3064a..c6cb3b3b0 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java @@ -1,5 +1,59 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalDissolutionChamberRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.api.gas.GasRegistry; +import mekanism.common.recipe.machines.DissolutionRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ChemicalDissolutionChamberRecipeWrapper extends BlankRecipeWrapper +{ + public DissolutionRecipe recipe; + + public ChemicalDissolutionChamberRecipeCategory category; + + public ChemicalDissolutionChamberRecipeWrapper(DissolutionRecipe r, ChemicalDissolutionChamberRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(recipe.getInput().ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 6-3 && mouseX <= 22-3 && mouseY >= 5-3 && mouseY <= 63-3) + { + currenttip.add(GasRegistry.getGas("sulfuricAcid").getLocalizedName()); + } + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java index 8aff84977..acdc7cbc2 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java @@ -1,5 +1,75 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalInfuserRecipeCategory { +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.ChemicalInfuserRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class ChemicalInfuserRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public ChemicalInfuserRecipe tempRecipe; + + public ITickTimer timer; + + public ChemicalInfuserRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiChemicalInfuser.png", "chemical_infuser", "tile.MachineBlock2.ChemicalInfuser.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 3; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 80); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(47-xOffset, 39-yOffset, 176, 71, 28, 8); + drawTexturedRect(101-xOffset, 39-yOffset, 176, 63, 28, 8); + + if(tempRecipe.getInput().leftGas != null) + { + displayGauge(58, 26-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().leftGas); + } + + if(tempRecipe.getOutput().output != null) + { + displayGauge(58, 80-xOffset, 5-yOffset, 176, 4, 58, null, tempRecipe.getOutput().output); + } + + if(tempRecipe.getInput().rightGas != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().rightGas); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalInfuserRecipeWrapper) + { + tempRecipe = ((ChemicalInfuserRecipeWrapper)recipeWrapper).recipe; + } + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java index 496c5e426..f68a48025 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalInfuserRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalInfuserRecipeHandler implements IRecipeHandler +{ + private final ChemicalInfuserRecipeCategory category; + + public ChemicalInfuserRecipeHandler(ChemicalInfuserRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalInfuserRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalInfuserRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalInfuserRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java index 50565f8cc..832d9283c 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java @@ -1,5 +1,61 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalInfuserRecipeWrapper { +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.ChemicalInfuserRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ChemicalInfuserRecipeWrapper extends BlankRecipeWrapper +{ + public ChemicalInfuserRecipe recipe; + + public ChemicalInfuserRecipeCategory category; + + public ChemicalInfuserRecipeWrapper(ChemicalInfuserRecipe r, ChemicalInfuserRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().leftGas)); + } + else if(mouseX >= 80-3 && mouseX <= 96-3 && mouseY >= 5-3 && mouseY <= 63-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().rightGas)); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java index 9d1f4d574..0f8bd2c81 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java @@ -1,5 +1,98 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalOxidizerRecipeCategory { +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class ChemicalOxidizerRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public OxidationRecipe tempRecipe; + + public GuiGasGauge gasOutput; + + public ITickTimer timer; + + public ChemicalOxidizerRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/GuiChemicalOxidizer.png", "chemical_oxidizer", "tile.MachineBlock2.ChemicalOxidizer.name", ProgressBar.LARGE_RIGHT); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 20; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 132, 62); + } + + @Override + public void addGuiElements() + { + guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 133, 13)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 25, 35)); + + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return (double)timer.getValue() / 20F; + } + }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 62, 39)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.getOutput().output != null) + { + gasOutput.setDummyType(tempRecipe.getOutput().output.getGas()); + gasOutput.renderScale(0, 0, -xOffset, -yOffset); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalOxidizerRecipeWrapper) + { + tempRecipe = ((ChemicalOxidizerRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 25-xOffset, 35-yOffset); + + itemStacks.set(0, tempRecipe.getInput().ingredient); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java index 30e08db65..69d3abdd9 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalOxidizerRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalOxidizerRecipeHandler implements IRecipeHandler +{ + private final ChemicalOxidizerRecipeCategory category; + + public ChemicalOxidizerRecipeHandler(ChemicalOxidizerRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalOxidizerRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalOxidizerRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalOxidizerRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java index d88ab5c4e..2391b3999 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java @@ -1,5 +1,55 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalOxidizerRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.api.gas.GasRegistry; +import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ChemicalOxidizerRecipeWrapper extends BlankRecipeWrapper +{ + public OxidationRecipe recipe; + + public ChemicalOxidizerRecipeCategory category; + + public ChemicalOxidizerRecipeWrapper(OxidationRecipe r, ChemicalOxidizerRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(recipe.getInput().ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 134-20 && mouseX <= 150-20 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java index a2798addb..2780eb9d7 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -1,5 +1,79 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalWasherRecipeCategory { +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.WasherRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class ChemicalWasherRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public WasherRecipe tempRecipe; + + public ITickTimer timer; + + public ChemicalWasherRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiChemicalWasher.png", "chemical_washer", "tile.MachineBlock2.ChemicalWasher.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 3; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 70); + fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 4, 16, 59); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(61-xOffset, 39-yOffset, 176, 63, 55, 8); + + //displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, new FluidStack(FluidRegistry.WATER, 1), null); + + if(tempRecipe.getInput().ingredient != null) + { + displayGauge(58, 27-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().ingredient); + } + + if(tempRecipe.getOutput().output != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getOutput().output); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalWasherRecipeWrapper) + { + tempRecipe = ((ChemicalWasherRecipeWrapper)recipeWrapper).recipe; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 6-xOffset, 5-yOffset, 16, 58, 1000, false, fluidOverlay); + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java index 035340d57..de25def2f 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalWasherRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalWasherRecipeHandler implements IRecipeHandler +{ + private final ChemicalWasherRecipeCategory category; + + public ChemicalWasherRecipeHandler(ChemicalWasherRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalWasherRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalWasherRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalWasherRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java index aa7697db5..ea248ca09 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java @@ -1,5 +1,67 @@ package mekanism.client.jei.machine.chemical; -public class ChemicalWasherRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.WasherRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +public class ChemicalWasherRecipeWrapper extends BlankRecipeWrapper +{ + public WasherRecipe recipe; + + public ChemicalWasherRecipeCategory category; + + public ChemicalWasherRecipeWrapper(WasherRecipe r, ChemicalWasherRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidInputs() + { + return Arrays.asList(new FluidStack(FluidRegistry.WATER, 1000)); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 27-3 && mouseX <= 43-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); + } + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java index eaf6265a2..aeed16c3b 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -1,5 +1,66 @@ package mekanism.client.jei.machine.other; -public class ElectrolyticSeparatorRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.SeparatorRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +public class ElectrolyticSeparatorRecipeWrapper extends BlankRecipeWrapper +{ + public SeparatorRecipe recipe; + + public ElectrolyticSeparatorRecipeCategory category; + + public ElectrolyticSeparatorRecipeWrapper(SeparatorRecipe r, ElectrolyticSeparatorRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidInputs() + { + return Arrays.asList(recipe.getInput().ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 59-5 && mouseX <= 75-5 && mouseY >= 19-9 && mouseY <= 47-9) + { + currenttip.add(recipe.getOutput().leftGas.getGas().getLocalizedName()); + } + else if(mouseX >= 101-5 && mouseX <= 117-5 && mouseY >= 19-9 && mouseY <= 47-9) + { + currenttip.add(recipe.getOutput().rightGas.getGas().getLocalizedName()); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java index 760f8672a..d85ccfca8 100644 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java @@ -1,5 +1,130 @@ package mekanism.client.jei.machine.other; -public class MetallurgicInfuserRecipeCategory { +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import mekanism.api.infuse.InfuseObject; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfuseType; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +public class MetallurgicInfuserRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public MetallurgicInfuserRecipe tempRecipe; + + public ITickTimer timer; + + public MetallurgicInfuserRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/GuiMetallurgicInfuser.png", "metallurgic_infuser", "tile.MachineBlock.MetallurgicInfuser.name", ProgressBar.MEDIUM); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 5; + yOffset = 16; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 166, 54); + } + + @Override + public void addGuiElements() + { + guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 16, 34)); + guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 50, 42)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 142, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 108, 42)); + + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); + guiElements.add(new GuiProgress(new IProgressInfoHandler() { + @Override + public double getProgress() + { + return (double)timer.getValue() / 20F; + } + }, ProgressBar.MEDIUM, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 70, 46)); + } + + public static List getInfuseStacks(InfuseType type) + { + List ret = new ArrayList(); + + for(Map.Entry obj : InfuseRegistry.getObjectMap().entrySet()) + { + if(obj.getValue().type == type) + { + ret.add(obj.getKey()); + } + } + + return ret; + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + InfuseType type = tempRecipe.getInput().infuse.type; + changeTexture(MekanismRenderer.getBlocksTexture()); + drawTexturedRectFromIcon(2, 2, type.sprite, 4, 52); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof MetallurgicInfuserRecipeWrapper) + { + tempRecipe = ((MetallurgicInfuserRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 45, 26); + itemStacks.init(1, false, 103, 26); + itemStacks.init(2, true, 11, 18); + + itemStacks.set(0, tempRecipe.getInput().inputStack); + itemStacks.setFromRecipe(1, recipeWrapper.getOutputs()); + itemStacks.set(2, getInfuseStacks(tempRecipe.getInput().infuse.type)); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java index 2f9624df7..b163a0c8d 100644 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class MetallurgicInfuserRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class MetallurgicInfuserRecipeHandler implements IRecipeHandler +{ + private final MetallurgicInfuserRecipeCategory category; + + public MetallurgicInfuserRecipeHandler(MetallurgicInfuserRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return MetallurgicInfuserRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull MetallurgicInfuserRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull MetallurgicInfuserRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java index 56ed41cf4..974a3cf43 100644 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class MetallurgicInfuserRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; + +import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class MetallurgicInfuserRecipeWrapper extends BlankRecipeWrapper +{ + public MetallurgicInfuserRecipe recipe; + + public MetallurgicInfuserRecipeCategory category; + + public MetallurgicInfuserRecipeWrapper(MetallurgicInfuserRecipe r, MetallurgicInfuserRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + List list = new ArrayList(); + list.add(recipe.getInput().inputStack); + list.addAll(MetallurgicInfuserRecipeCategory.getInfuseStacks(recipe.getInput().infuse.type)); + + return list; + } + + @Nonnull + @Override + public List getOutputs() + { + return Arrays.asList(recipe.getOutput().output); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java index 2a121a327..c88d2c81e 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java @@ -1,5 +1,67 @@ package mekanism.client.jei.machine.other; -public class PRCRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.PressurizedRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +public class PRCRecipeWrapper extends BlankRecipeWrapper +{ + public PressurizedRecipe recipe; + + public PRCRecipeCategory category; + + public PRCRecipeWrapper(PressurizedRecipe r, PRCRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidInputs() + { + return Arrays.asList(new FluidStack(FluidRegistry.WATER, 1000)); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).gasStack)); + } + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).fluidStack)); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java index c2a7c1b3c..3a4ad835f 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -1,5 +1,57 @@ package mekanism.client.jei.machine.other; -public class SolarNeutronRecipeWrapper { +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class SolarNeutronRecipeWrapper extends BlankRecipeWrapper +{ + public SolarNeutronRecipe recipe; + + public SolarNeutronRecipeCategory category; + + public SolarNeutronRecipeWrapper(SolarNeutronRecipe r, SolarNeutronRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 26-5 && mouseX <= 42-5 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); + } + else if(mouseX >= 134-5 && mouseX <= 150-5 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java index ec4e23964..3fc0c671a 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java @@ -1,5 +1,37 @@ package mekanism.client.jei.machine.other; -public class ThermalEvaporationRecipeWrapper { +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; + +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraftforge.fluids.FluidStack; + +public class ThermalEvaporationRecipeWrapper extends BlankRecipeWrapper +{ + public ThermalEvaporationRecipe recipe; + + public ThermalEvaporationRecipeCategory category; + + public ThermalEvaporationRecipeWrapper(ThermalEvaporationRecipe r, ThermalEvaporationRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getFluidInputs() + { + return Arrays.asList(recipe.getInput().ingredient); + } + + @Nonnull + @Override + public List getFluidOutputs() + { + return Arrays.asList(recipe.getOutput().output); + } } diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 78ae7ebb2..1bc8a8e87 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -103,7 +103,7 @@ public class MekanismRenderer for(Gas gas : GasRegistry.getRegisteredGasses()) { - gas.updateIcon(event.map); + gas.registerIcon(event.map); } for(InfuseType type : InfuseRegistry.getInfuseMap().values()) @@ -127,6 +127,11 @@ public class MekanismRenderer public void onStitch(TextureStitchEvent.Post event) { initFluidTextures(event.map); + + for(Gas gas : GasRegistry.getRegisteredGasses()) + { + gas.updateIcon(event.map); + } } public static void registerItemRender(String domain, Item item) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index d57937f26..0ac813523 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -759,11 +759,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), "SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName )); -/* CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, i), "PSP", "SDS", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), Items.glowstone_dust )); -*/ } for(int i = 0; i < EnumColor.DYES.length; i++) diff --git a/src/main/resources/assets/mekanism/gui/GuiAdvancedMachine.png b/src/main/resources/assets/mekanism/gui/GuiAdvancedMachine.png index 612c487f0d71ab84a1eceb4e76e8e2e109633044..9922532bc477cd0aafcc9cba4cacd808eb4931ab 100644 GIT binary patch literal 15859 zcmeI3Z*Ual9mk)XjD}chW<+5$$o8n6;&9nNxj(t>jd?Af}L1c^~MP~|S)NyREGh#`#RwywMwWTR`z-esy?EQW2 za>tX7ynJ@%=6?6=_xF9C=kxrY=l0D$zJA@BMHP2d000)XGz+Z&l)4y z!LNm}=5_;sTW_~MW#E~EO9AjctAyIjw%}S`(xTO3SnHIl6VVt{1K_(q5fi0e*`zw< zZbhxLUw-v>c1j7?**Cd@OfVLZdz9v#y1ZfMx{$Q9SMrAK_xme+2_70mWmBXQ(THmB zi8_1Imxr;{OxvlX#O$rJH&`7~ZNc?aK+|Q)Rqb|2EXz_JZ#CIj&D2`!WG~=aN z#=)>W%kUgSr7yd`0!BVP+{L#FP3i97uR42=X~uY(j>qHG@tSH)@1|L=*Gn@T&2bK> za2WlnDJC4Mu_9%X@eyQ0(v_I0Xewp-ik(`YS!cIf9c8cdyrQveN2-x#2Px7CF-Ei1 z3|%5A7`%R3G+H#%Fk9u^%!+nsg!*GL-6|VepDxKzzM|L=46|_uoKhOmJd7H5$f{Y? zDlBDvVtslf2|6s%azu{86a!LVi_Rt1qnVn~qm=-dyX%T;_T-RqtPXz+W@}$1INm0XE+*s+O3sZ81lXH^=(UkqL zu-y*E>0sR<*3B~`&NlIDZ5!Av;S3lwb^PC~JmS;UY>qI>eWuXV$h+)wb z=jDQG^L>IrzC|@mQI+Ht!4KzNtteq$=4#j)sgrXsHH^!_Ih~?IWJI@v^VGN{PggDH zuH}-G%uk ztSdX@aFeb@lY2ZS>V|A>ojQAF?_>{!bRi@+AFs@vYHB=;Ph=DyVJaH*Lx zjW}l{HRqhgkeg~jT|@K_>Iyv8#R$U6TEYJZa}f(<5YP>F)2tY9|MVmMTl2OK*A4Ra z{MO8kh%(QG$u18((s)s_j%~jo!o~H`$zv|lmK#(m!|Es{D6*#WE8jWkrTd8Y$ZC4K z7u~8UtE8&5iJ^6waZ#5Wy5WwP&qAjmt+DHWy~BR}ylhO;F&0YFOKZbGg$=g?EZ(wwKIA?xZtQ z#eh6YC2J+s3Ln(qGa{XRNX##z?C!k5L2gPn*ci1VouD+ZF~NmJgbD~Qlm<2?xUh&& z0l|gRz{Ug@77;2SxKJ9{nBc-9LIngDN&_1cTv$Y?fZ#%DU}J&{iwG4ETqq4}OmJZl zp#p*nrGbqJE-WHcKyaZnura}fMT80nE|dl~Cb+POPyxY((!j<97ZwpJAh=K(*qGqL zB0>cO7fJ&g6I@tCsDR)?X<%c53yTO95L_q?Y)o)r5upNt3#EaL2`(%mR6uZ{G_Wzj zg++u42riTcHYT{Rh)@B+h0?&r1Q!+&Dj>K}8rb-{xGHk5UCJta*D?-Ys=V;|CKbMr zNlDGEK>&8%3&7xG0DL(Mzb^sM#{lr@Rsi@R0G4P!d-(Mx0B#y<5gI~?_dowj!?q9V z7Y|%f^`i;>`3t!{BYxeJ6bgAv#pFi`R=-TP=--HG}dhyXE_qFf&_K#j$ ztZh5VKX+*P`=3f5bY9(2wXAug{_o+?o_*lzuI!(VnN@ zzSnLaIoEr3^M?zae=R$Ht-*TpbOERY^EOs`GpBA#EPx~W+GDB& z=U@1{IxubWu04;PzEF9Z8IsO?Xq*_?HM`-n*WWopFFd*1w)v^n&ZRdSfB5aLGtS^h zsN^uMfhULFVHnF#UWn~&ec+0ReY5Jo%0}VH%T2<}vBaq+$~eGGU2J;x+_`gm_kQvp z|F$D<$urM=Z}7_nFCCqJHZ@-U z#S{Mklehoz_ix;7Y=%E4md&ALS^5nky$yJYh^Bu!jQMqdWzWRI0lIwi@ z?Xjl^kJ)}P`a|#XS8P`r%Z47TzqLafQ+|2zdlQ? zH^NT}*vUzCw*RN!pD-R+`QG-bWn0E4meu=*zk1|y&(XUEK3X#|x@2%H4n}vc`|7Ip z-nYa%w#?kNfAZlnTgSi+S?B!Hy#eK%w;Sp~l`XHK=!Us->J|XN?CecoXv^7u9X>GG Q41a=_#&yET>a9QcA9c$WBme*a delta 980 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 Pz^Ia delta 1816 zcmZvY2~d;Q7RSE;uWF^%+VT)Z_zYzcFe@=8kU$`yR8c{KFIu882@;ijWMPwN@G%`< zTS4#xBM4%BfE9#9&;f~TWhk;Fp(3jUP&R8=Boq*2X=rQ5dGpT9ow@(>Kj+-vxwVOi zT#J-1?X4uf|B@Vr!Xz_#MGcY%KelA5~UZ3B9UxM5^EPs|bVBPD!D z0Iq8GNhnG}K_cO^2o#);pul949S9K4Hr;GOLBf!!>la8cHX<@0fJ}!tQ4u_W#Gh_7 zo|-yEyf^#>VhLNo;jJ3RQWT%hCHvtp1Yd6~mX4zt>3rQtyLJ)%NO*7W-8edi=uP{h zm+T|ru_cfw7=q4HkbkaxC>)YN;&3Pu^zi|mj_?IsC`P;kNri=GUu+Uff_PzM{s-^D zm1e7ie;V8m361D7B$^6(p#Nv>_o*Pd-|97%Y-En$N!Ui=85_ywoZ(48o`6e1ijbaE z*}h?K0QjiUpH2&o?HTJ;3xY?tHB9xB@PipsF417hragf)wZjkJr8rwewMDcOUYESI zaW1YoliNqPm%Tz+wiX11GK$j3w?i38L52|TgoOK)*_JG-56|}`?HH@2YgxMMa?6`C z5`NTOOS*NZsVuW*d#hW(!Lq1<-4pgv3YgfYeOV6YxIUKm zCokVzE>G8#H`S?&axb6GxgJ2+99GrVEG?5~7~aJX3j2ON?4Gx%I%4xbuh zWG@z$&cyzFi_oN8{4qWN{wC0Iv;dxO9%z$BzO-zo*)-3VH9VWwzBt5Sl-gdjtrl*t zwz?oo#~0<6Eu8yjGn4Q7G}ro`mRGn$GW;R_Y<{yZs>}qoOj8 z>f-18FgPC1&;+~iI~yk(Z0{VO9ML^Wmu1@^?;5;J zZ&xd(*{s5&ad)bv0}Un7265Ltg~BtrW@sv>0BTZ|hf<%#h^wkI^Hp+LBXD+Sq$_bV6u{Ui%h#e_<)* zLh#6VT0_x;%nGTt!WHzJ4_!{JKaJ8=z_t(j+}~cOS|ubUeKLv3?=i;Uaj3UEb#eOC z3bRAblZ5FPm6_VQ60)qCX_8XQI)HLbKiDT)*Sab&yjB#LuH=`lj84C6i(fnqZQor5V`vP-S~!q~gF!Dd zSV`R|d#mW#Q2UE;=5@Q>Tug;@UW8&jepPP)EL$el4(wezU;Oo>tH$p@-`fXx0kOlG z`NEB634`ZEAq@Ks69`O%1F^-SvjqeiT89MlLKS=VLHmC!vi1Q3%p(B$Wq-P3^HY7N z;s!^9*G{bftQYn*L;r}ifzLc`+*)fbzWGs9^2(ZlP4Ix1wU1fNb^rk+|8Qqw&70e^ z*YOS3`E6XEhhZ|?5=SCSX_rE3!;Cg=yV%juVY6~>@aLqZxi_i8)_9Yi&z@x6&Ef0; z=ivKPYZouT+GHazu(`z8aoF>cydl|ZWdD-2yGiA3i<;&2Z#>3gIhtwBeY=!+SV-Lr zCs572Kwtx6Ef8tm{l}=f=ILkKE}qz8RQ3P}BmjVR=q?d4{_$CjTT7hi$cYV3z&mu! zv{GM0(z-XO`SSOJn12tl=rS_ZHFJ!`+f*hhGr$bk2qfzaIhGvJ=St_ynVFfdRnh9t zE^^9Eenf><424IATi0(*Q2Ye1Q406&&YjfRy|}evaf|#4TD!mB9)_q}jHv7W&-oY* lq7pyIuWGw3he!HN%z From 7183aa21adb3f3ecca3d2155a44389ecdda7de55 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 20 May 2016 11:18:26 -0400 Subject: [PATCH 12/15] Remove legacy implementations --- .../AdvancedMachineRecipeHandler.java | 306 ------------ .../BaseRecipeHandler.java | 172 ------- .../ChanceMachineRecipeHandler.java | 195 -------- .../ChemicalCrystallizerRecipeHandler.java | 274 ----------- ...emicalDissolutionChamberRecipeHandler.java | 287 ------------ .../ChemicalInfuserRecipeHandler.java | 306 ------------ ...ChemicalInjectionChamberRecipeHandler.java | 95 ---- .../ChemicalOxidizerRecipeHandler.java | 293 ------------ .../ChemicalWasherRecipeHandler.java | 348 -------------- .../CombinerRecipeHandler.java | 59 --- .../CrusherRecipeHandler.java | 48 -- .../ElectrolyticSeparatorRecipeHandler.java | 390 --------------- .../ElementBoundHandler.java | 31 -- .../EnrichmentChamberRecipeHandler.java | 48 -- .../MachineRecipeHandler.java | 164 ------- .../MekanismSlotClickHandler.java | 33 -- .../MetallurgicInfuserRecipeHandler.java | 257 ---------- .../NEIMekanismConfig.java | 132 ------ .../OsmiumCompressorRecipeHandler.java | 59 --- .../mekanism.client.nei/PRCRecipeHandler.java | 443 ------------------ .../PrecisionSawmillRecipeHandler.java | 48 -- .../PurificationChamberRecipeHandler.java | 71 --- .../RotaryCondensentratorRecipeHandler.java | 347 -------------- .../ShapedMekanismRecipeHandler.java | 156 ------ .../ShapelessMekanismRecipeHandler.java | 125 ----- .../SolarNeutronRecipeHandler.java | 286 ----------- .../ThermalEvaporationRecipeHandler.java | 286 ----------- .../BasicRenderingHandler.java | 92 ---- .../CTMRenderingHandler.java | 102 ---- .../MachineRenderingHandler.java | 272 ----------- .../PlasticRenderingHandler.java | 96 ---- .../RenderBlocksCTM.java | 382 --------------- .../TextureSubmap.java | 42 -- .../TextureVirtual.java | 96 ---- .../jei/machine/other/PRCRecipeWrapper.java | 15 +- 35 files changed, 7 insertions(+), 6349 deletions(-) delete mode 100644 legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/BaseRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/CombinerRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/CrusherRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ElementBoundHandler.java delete mode 100644 legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/MachineRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/MekanismSlotClickHandler.java delete mode 100644 legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/NEIMekanismConfig.java delete mode 100644 legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/PRCRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java delete mode 100644 legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java delete mode 100644 legacy/mekanism.client.render.block/BasicRenderingHandler.java delete mode 100644 legacy/mekanism.client.render.block/CTMRenderingHandler.java delete mode 100644 legacy/mekanism.client.render.block/MachineRenderingHandler.java delete mode 100644 legacy/mekanism.client.render.block/PlasticRenderingHandler.java delete mode 100644 legacy/mekanism.client.render.block/RenderBlocksCTM.java delete mode 100644 legacy/mekanism.client.render.block/TextureSubmap.java delete mode 100644 legacy/mekanism.client.render.block/TextureVirtual.java diff --git a/legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java b/legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java deleted file mode 100644 index 536a86cfc..000000000 --- a/legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java +++ /dev/null @@ -1,306 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiSlot.SlotOverlay; -import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.inputs.AdvancedMachineInput; -import mekanism.common.recipe.machines.AdvancedMachineRecipe; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class AdvancedMachineRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public abstract String getRecipeId(); - - public abstract Collection getRecipes(); - - public abstract List getFuelStacks(Gas gasType); - - public abstract ProgressBar getProgressType(); - - @Override - public void addGuiElements() - { - guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 16)); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 30, 34).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52)); - guiElements.add(new GuiSlot(SlotType.OUTPUT_LARGE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 40 ? (ticksPassed - 40) % 20 / 20.0F : 0.0F; - } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(12, 0, 28, 5, 144, 68); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -16, -5); - } - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.input.gasType != null && ticksPassed >= 20) - { - int displayInt = ticksPassed < 40 ? (ticksPassed-20)*12 / 20 : 12; - displayGauge(45, 32 + 12 - displayInt, 6, displayInt, new GasStack(recipe.input.gasType, 1)); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(63, 34, 24, 7), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(AdvancedMachineRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStacks(irecipe.getInput().gasType))); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(AdvancedMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().output, result)) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStacks(irecipe.getInput().gasType))); - } - } - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiAdvancedMachine.png"; - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(AdvancedMachineRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().gasType == ((GasStack)ingredients[0]).getGas()) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStacks(irecipe.getInput().gasType))); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(AdvancedMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getInput().itemStack, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStacks(irecipe.getInput().gasType))); - } - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 45 && xAxis <= 51 && yAxis >= 33 && yAxis <= 45) - { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).input.gasType.getLocalizedName()); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - GasStack stack = null; - - if(xAxis >= 45 && xAxis <= 51 && yAxis >= 33 && yAxis <= 45) - { - stack = new GasStack(((CachedIORecipe)arecipes.get(recipe)).input.gasType, 1); - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - GasStack stack = null; - - if(xAxis >= 45 && xAxis <= 51 && yAxis >= 33 && yAxis <= 45) - { - stack = new GasStack(((CachedIORecipe)arecipes.get(recipe)).input.gasType, 1); - } - - if(stack != null) - { - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public List fuelStacks; - - public AdvancedMachineInput input; - - public PositionedStack outputStack; - - @Override - public PositionedStack getIngredient() - { - return new PositionedStack(input.itemStack, 40, 12); - } - - @Override - public PositionedStack getResult() - { - return outputStack; - } - - @Override - public PositionedStack getOtherStack() - { - return new PositionedStack(fuelStacks.get(cycleticks/40 % fuelStacks.size()), 40, 48); - } - - public CachedIORecipe(AdvancedMachineInput adv, ItemStack output, List fuels) - { - input = adv; - outputStack = new PositionedStack(output, 100, 30); - fuelStacks = fuels; - } - - public CachedIORecipe(AdvancedMachineRecipe recipe, List fuels) - { - this(recipe.getInput(), recipe.getOutput().output, fuels); - } - } -} diff --git a/legacy/mekanism.client.nei/BaseRecipeHandler.java b/legacy/mekanism.client.nei/BaseRecipeHandler.java deleted file mode 100644 index 5fe5f3879..000000000 --- a/legacy/mekanism.client.nei/BaseRecipeHandler.java +++ /dev/null @@ -1,172 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.lib.gui.GuiDraw.gui; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.IGuiWrapper; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.render.MekanismRenderer; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidStack; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class BaseRecipeHandler extends TemplateRecipeHandler implements IGuiWrapper -{ - public BaseRecipeHandler() - { - addGuiElements(); - } - - public Set guiElements = new HashSet(); - - public abstract void addGuiElements(); - - public void displayGauge(int length, int xPos, int yPos, int overlayX, int overlayY, int scale, FluidStack fluid, GasStack gas) - { - if(fluid == null && gas == null) - { - return; - } - - int start = 0; - - while(true) - { - int renderRemaining = 0; - - if(scale > 16) - { - renderRemaining = 16; - scale -= 16; - } - else { - renderRemaining = scale; - scale = 0; - } - - changeTexture(MekanismRenderer.getBlocksTexture()); - - if(fluid != null) - { - gui.drawTexturedModelRectFromIcon(xPos, yPos + length - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); - } - else if(gas != null) - { - gui.drawTexturedModelRectFromIcon(xPos, yPos + length - renderRemaining - start, gas.getGas().getIcon(), 16, 16 - (16 - renderRemaining)); - } - - start+=16; - - if(renderRemaining == 0 || scale == 0) - { - break; - } - } - - changeTexture(getGuiTexture()); - drawTexturedModalRect(xPos, yPos, overlayX, overlayY, 16, length+1); - } - - /* - * true = usage, false = recipe - */ - public boolean doGasLookup(GasStack stack, boolean type) - { - if(stack != null && stack.amount > 0) - { - if(type) - { - if(!GuiUsageRecipe.openRecipeGui("gas", new Object[] {stack})) - { - return false; - } - } - else { - if(!GuiCraftingRecipe.openRecipeGui("gas", new Object[] {stack})) - { - return false; - } - } - - return true; - } - - return false; - } - - public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, GasStack gas) - { - if(gas == null) - { - return; - } - - changeTexture(MekanismRenderer.getBlocksTexture()); - gui.drawTexturedModelRectFromIcon(xPos, yPos, gas.getGas().getIcon(), sizeX, sizeY); - } - - public String stripTexture() - { - return getGuiTexture().replace("mekanism:gui/", ""); - } - - /* - * true = usage, false = recipe - */ - public boolean doFluidLookup(FluidStack stack, boolean type) - { - if(stack != null && stack.amount > 0) - { - if(type) - { - if(!GuiUsageRecipe.openRecipeGui("fluid", new Object[] {stack})) - { - return false; - } - } - else { - if(!GuiCraftingRecipe.openRecipeGui("fluid", new Object[] {stack})) - { - return false; - } - } - - return true; - } - - return false; - } - - @Override - public void drawTexturedRect(int x, int y, int u, int v, int w, int h) - { - drawTexturedModalRect(x, y, u, v, w, h); - } - - @Override - public void drawTexturedRectFromIcon(int x, int y, IIcon icon, int w, int h) - { - gui.drawTexturedModelRectFromIcon(x, y, icon, w, h); - } - - @Override - public void displayTooltip(String s, int xAxis, int yAxis) {} - - @Override - public void displayTooltips(List list, int xAxis, int yAxis) {} - - @Override - public FontRenderer getFont() - { - return null; - } -} diff --git a/legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java b/legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java deleted file mode 100644 index e9e56e0ac..000000000 --- a/legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java +++ /dev/null @@ -1,195 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; -import java.util.Collection; - -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiSlot.SlotOverlay; -import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.recipe.machines.ChanceMachineRecipe; -import mekanism.common.recipe.outputs.ChanceOutput; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class ChanceMachineRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public abstract String getRecipeId(); - - public abstract Collection getRecipes(); - - public abstract ProgressBar getProgressType(); - - @Override - public void addGuiElements() - { - guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 16)); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.OUTPUT_WIDE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(12, 0, 28, 5, 144, 68); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -16, -5); - } - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.output.hasSecondary()) - { - drawString(Math.round(recipe.output.secondaryChance*100) + "%", 116, 52, 0x404040, false); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(63, 34, 24, 7), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(ChanceMachineRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(ChanceMachineRecipe irecipe : getRecipes()) - { - if(irecipe.getOutput().hasPrimary() && NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().primaryOutput, result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - else if(irecipe.getOutput().hasSecondary() && NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().secondaryOutput, result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiBasicMachine.png"; - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(ChanceMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting((ItemStack)irecipe.getInput().ingredient, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack input; - public ChanceOutput output; - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - if(output.hasPrimary()) - { - return new PositionedStack(output.primaryOutput, 100, 30); - } - - return null; - } - - @Override - public PositionedStack getOtherStack() - { - if(output.hasSecondary()) - { - return new PositionedStack(output.secondaryOutput, 116, 30); - } - - return null; - } - - public CachedIORecipe(ItemStack itemstack, ChanceOutput chance) - { - input = new PositionedStack(itemstack, 40, 12); - output = chance; - } - - public CachedIORecipe(ChanceMachineRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput()); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java deleted file mode 100644 index 72821cc56..000000000 --- a/legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java +++ /dev/null @@ -1,274 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalCrystallizer; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.CrystallizerRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalCrystallizerRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 3; - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ChemicalCrystallizer.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicalcrystallizer"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiChemicalCrystallizer.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalCrystallizer.class; - } - - public String getRecipeId() - { - return "mekanism.chemicalcrystallizer"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_CRYSTALLIZER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 147, 79); - } - - @Override - public void drawExtras(int i) - { - GasStack gas = ((CachedIORecipe)arecipes.get(i)).inputStack; - - float f = ticksPassed % 20 / 20.0F; - drawProgressBar(53-xOffset, 61-yOffset, 176, 63, 48, 8, f, 0); - - if(gas != null) - { - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, gas); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(53-xOffset, 61-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(CrystallizerRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(CrystallizerRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().output, result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).inputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - - if(stack != null) - { - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(CrystallizerRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().ingredient.isGasEqual((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public GasStack inputStack; - public PositionedStack outputStack; - - @Override - public PositionedStack getResult() - { - return outputStack; - } - - public CachedIORecipe(GasStack input, ItemStack output) - { - inputStack = input; - outputStack = new PositionedStack(output, 131-xOffset, 57-yOffset); - } - - public CachedIORecipe(CrystallizerRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java deleted file mode 100644 index 2dc3b302f..000000000 --- a/legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java +++ /dev/null @@ -1,287 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasRegistry; -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalDissolutionChamber; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.DissolutionRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalDissolutionChamberRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 3; - - @Override - public String getRecipeName() - { - return LangUtils.localize("gui.chemicalDissolutionChamber.short"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicaldissolutionchamber"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiChemicalDissolutionChamber.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalDissolutionChamber.class; - } - - public String getRecipeId() - { - return "mekanism.chemicaldissolutionchamber"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_DISSOLUTION_CHAMBER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 79); - } - - @Override - public void drawExtras(int i) - { - GasStack gas = ((CachedIORecipe)arecipes.get(i)).outputStack; - - float f = ticksPassed % 20 / 20.0F; - drawProgressBar(64-xOffset, 40-yOffset, 176, 63, 48, 8, f, 0); - - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, new GasStack(GasRegistry.getGas("sulfuricAcid"), 1)); - - if(gas != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, gas); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(64-xOffset, 40-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(DissolutionRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(DissolutionRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - currenttip.add(GasRegistry.getGas("sulfuricAcid").getLocalizedName()); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = new GasStack(GasRegistry.getGas("sulfuricAcid"), 1); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = new GasStack(GasRegistry.getGas("sulfuricAcid"), 1); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(stack != null) - { - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(DissolutionRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting((ItemStack)irecipe.getInput().ingredient, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack inputStack; - public GasStack outputStack; - - @Override - public PositionedStack getIngredient() - { - return inputStack; - } - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(ItemStack input, GasStack output) - { - inputStack = new PositionedStack(input, 26-xOffset, 36-yOffset); - outputStack = output; - } - - public CachedIORecipe(DissolutionRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java deleted file mode 100644 index f0040b32a..000000000 --- a/legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java +++ /dev/null @@ -1,306 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalInfuser; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.ChemicalPairInput; -import mekanism.common.recipe.machines.ChemicalInfuserRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalInfuserRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 3; - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ChemicalInfuser.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicalinfuser"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiChemicalInfuser.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalInfuser.class; - } - - public String getRecipeId() - { - return "mekanism.chemicalinfuser"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_INFUSER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 80); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - drawTexturedModalRect(47-xOffset, 39-yOffset, 176, 71, 28, 8); - drawTexturedModalRect(101-xOffset, 39-yOffset, 176, 63, 28, 8); - - if(recipe.chemicalInput.leftGas != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 4, 58, null, recipe.chemicalInput.leftGas); - } - - if(recipe.outputStack != null) - { - displayGauge(58, 80-xOffset, 5-yOffset, 176, 4, 58, null, recipe.outputStack); - } - - if(recipe.chemicalInput.rightGas != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, recipe.chemicalInput.rightGas); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(47-xOffset, 39-yOffset, 28, 8), getRecipeId(), new Object[0])); - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(101-xOffset, 39-yOffset, 28, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(ChemicalInfuserRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(ChemicalInfuserRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(ChemicalInfuserRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().containsType((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+13 && yAxis <= 72+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).chemicalInput.leftGas)); - } - else if(xAxis >= 80 && xAxis <= 96 && yAxis >= 5+13 && yAxis <= 63+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).chemicalInput.rightGas)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+13 && yAxis <= 72+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).chemicalInput.leftGas; - } - else if(xAxis >= 80 && xAxis <= 96 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).chemicalInput.rightGas; - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+13 && yAxis <= 72+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).chemicalInput.leftGas; - } - else if(xAxis >= 80 && xAxis <= 96 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).chemicalInput.rightGas; - } - - if(stack != null) - { - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public ChemicalPairInput chemicalInput; - public GasStack outputStack; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(ChemicalPairInput input, GasStack output) - { - chemicalInput = input; - outputStack = output; - } - - public CachedIORecipe(ChemicalInfuserRecipe recipe) - { - this(recipe.getInput(), recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java deleted file mode 100644 index e94cb15cf..000000000 --- a/legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java +++ /dev/null @@ -1,95 +0,0 @@ -package mekanism.client.nei; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiChemicalInjectionChamber; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.Tier.GasTankTier; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.InjectionRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("nei.chemicalInjectionChamber"); - } - - @Override - public String getRecipeId() - { - return "mekanism.chemicalinjectionchamber"; - } - - @Override - public String getOverlayIdentifier() - { - return "chemicalinjectionchamber"; - } - - @Override - public Collection getRecipes() - { - return Recipe.CHEMICAL_INJECTION_CHAMBER.get().values(); - } - - @Override - public List getFuelStacks(Gas gasType) - { - if(gasType == GasRegistry.getGas("sulfuricAcid")) - { - List fuels = new ArrayList(); - fuels.addAll(OreDictionary.getOres("dustSulfur")); - - for(GasTankTier tier : GasTankTier.values()) - { - fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("sulfuricAcid"))); - } - - return fuels; - } - else if(gasType == GasRegistry.getGas("water")) - { - for(GasTankTier tier : GasTankTier.values()) - { - return ListUtils.asList(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("water"))); - } - } - else if(gasType == GasRegistry.getGas("hydrogenChloride")) - { - List fuels = new ArrayList(); - fuels.addAll(OreDictionary.getOres("dustSalt")); - - for(GasTankTier tier : GasTankTier.values()) - { - fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("hydrogenChloride"))); - } - - return fuels; - } - - return new ArrayList(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.YELLOW; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalInjectionChamber.class; - } -} diff --git a/legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java deleted file mode 100644 index 6f5b877c5..000000000 --- a/legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java +++ /dev/null @@ -1,293 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalOxidizer; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiSlot.SlotOverlay; -import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.OxidationRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalOxidizerRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public GuiGasGauge gasOutput; - - public static int xOffset = 5; - public static int yOffset = 12; - - @Override - public void addGuiElements() - { - guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 133, 13)); - - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 154, 4).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 25, 35)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 154, 24).with(SlotOverlay.PLUS)); - - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - } - }, ProgressBar.LARGE_RIGHT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 62, 39)); - } - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ChemicalOxidizer.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicaloxidizer"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiChemicalOxidizer.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalOxidizer.class; - } - - public String getRecipeId() - { - return "mekanism.chemicaloxidizer"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_OXIDIZER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(0, 0, xOffset, yOffset, 147, 62); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.outputStack != null) - { - gasOutput.setDummyType(recipe.outputStack.getGas()); - gasOutput.renderScale(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(64-xOffset, 40-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(OxidationRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(OxidationRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 134-5 && xAxis <= 150-5 && yAxis >= 14-11 && yAxis <= 72-11) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 134-5 && xAxis <= 150-5 && yAxis >= 14-11 && yAxis <= 72-11) - { - GasStack stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 134-5 && xAxis <= 150-5 && yAxis >= 14-11 && yAxis <= 72-11) - { - GasStack stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 2; - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(OxidationRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getInput().ingredient, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack inputStack; - public GasStack outputStack; - - @Override - public PositionedStack getIngredient() - { - return inputStack; - } - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(ItemStack input, GasStack output) - { - inputStack = new PositionedStack(input, 26-xOffset, 36-yOffset); - outputStack = output; - } - - public CachedIORecipe(OxidationRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java deleted file mode 100644 index 808029516..000000000 --- a/legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java +++ /dev/null @@ -1,348 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalWasher; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.WasherRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalWasherRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 3; - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ChemicalWasher.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicalwasher"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiChemicalWasher.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalWasher.class; - } - - public String getRecipeId() - { - return "mekanism.chemicalwasher"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_WASHER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 70); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - drawTexturedModalRect(61-xOffset, 39-yOffset, 176, 63, 55, 8); - - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, new FluidStack(FluidRegistry.WATER, 1), null); - - if(recipe.outputStack != null) - { - displayGauge(58, 27-xOffset, 14-yOffset, 176, 4, 58, null, recipe.inputStack); - } - - if(recipe.inputStack != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, recipe.outputStack); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(61-xOffset, 39-yOffset, 55, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(WasherRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(WasherRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - if(((FluidStack)ingredients[0]).getFluid() == FluidRegistry.WATER) - { - for(WasherRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(WasherRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().ingredient.isGasEqual((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - currenttip.add(FluidRegistry.WATER.getLocalizedName(null)); - } - else if(xAxis >= 27 && xAxis <= 43 && yAxis >= 14+13 && yAxis <= 72+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).inputStack)); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - fluid = new FluidStack(FluidRegistry.WATER, 1); - } - else if(xAxis >= 27 && xAxis <= 43 && yAxis >= 14+13 && yAxis <= 72+13) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - fluid = new FluidStack(FluidRegistry.WATER, 1); - } - else if(xAxis >= 27 && xAxis <= 43 && yAxis >= 14+13 && yAxis <= 72+13) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(button == 0) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public GasStack inputStack; - public GasStack outputStack; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(GasStack input, GasStack output) - { - inputStack = input; - outputStack = output; - } - - public CachedIORecipe(WasherRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/CombinerRecipeHandler.java b/legacy/mekanism.client.nei/CombinerRecipeHandler.java deleted file mode 100644 index c6e052620..000000000 --- a/legacy/mekanism.client.nei/CombinerRecipeHandler.java +++ /dev/null @@ -1,59 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiCombiner; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.CombinerRecipe; -import mekanism.common.util.LangUtils; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.Combiner.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.combiner"; - } - - @Override - public String getOverlayIdentifier() - { - return "combiner"; - } - - @Override - public Collection getRecipes() - { - return Recipe.COMBINER.get().values(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.STONE; - } - - @Override - public List getFuelStacks(Gas gasType) - { - return ListUtils.asList(new ItemStack(Blocks.cobblestone)); - } - - @Override - public Class getGuiClass() - { - return GuiCombiner.class; - } -} diff --git a/legacy/mekanism.client.nei/CrusherRecipeHandler.java b/legacy/mekanism.client.nei/CrusherRecipeHandler.java deleted file mode 100644 index 0b695e98a..000000000 --- a/legacy/mekanism.client.nei/CrusherRecipeHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; - -import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.CrusherRecipe; -import mekanism.common.util.LangUtils; - -public class CrusherRecipeHandler extends MachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.Crusher.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.crusher"; - } - - @Override - public String getOverlayIdentifier() - { - return "crusher"; - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.CRUSH; - } - - @Override - public Collection getRecipes() - { - return Recipe.CRUSHER.get().values(); - } - - @Override - public Class getGuiClass() - { - return GuiCrusher.class; - } -} diff --git a/legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java b/legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java deleted file mode 100644 index cb5a27450..000000000 --- a/legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java +++ /dev/null @@ -1,390 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiElectrolyticSeparator; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiSlot.SlotOverlay; -import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.FluidInput; -import mekanism.common.recipe.machines.SeparatorRecipe; -import mekanism.common.recipe.outputs.ChemicalPairOutput; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ElectrolyticSeparatorRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public GuiFluidGauge fluidInput; - public GuiGasGauge leftGas; - public GuiGasGauge rightGas; - - public static int xOffset = 5; - public static int yOffset = 9; - - @Override - public void addGuiElements() - { - guiElements.add(fluidInput = GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10)); - guiElements.add(leftGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 18)); - guiElements.add(rightGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 51)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 34).with(SlotOverlay.POWER)); - - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return 1; - } - }, ProgressBar.BI, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 78, 29)); - } - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ElectrolyticSeparator.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "electrolyticseparator"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiElectrolyticSeparator.png"; - } - - @Override - public Class getGuiClass() - { - return GuiElectrolyticSeparator.class; - } - - public String getRecipeId() - { - return "mekanism.electrolyticseparator"; - } - - public Collection getRecipes() - { - return Recipe.ELECTROLYTIC_SEPARATOR.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-1, 0, 4, yOffset, 167, 62); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.fluidInput != null) - { - fluidInput.setDummyType(recipe.fluidInput.ingredient.getFluid()); - fluidInput.renderScale(0, 0, -xOffset, -yOffset); - } - - if(recipe.outputPair.leftGas != null) - { - displayGauge(28, 59-xOffset, 19-yOffset, 176, 68, 28, null, recipe.outputPair.leftGas); - leftGas.setDummyType(recipe.outputPair.leftGas.getGas()); - leftGas.renderScale(0, 0, -xOffset, -yOffset); - } - - if(recipe.outputPair.rightGas != null) - { - displayGauge(28, 101-xOffset, 19-yOffset, 176, 68, 28, null, recipe.outputPair.rightGas); - rightGas.setDummyType(recipe.outputPair.rightGas.getGas()); - rightGas.renderScale(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(80-xOffset, 30-yOffset, 16, 6), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(SeparatorRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(SeparatorRecipe irecipe : getRecipes()) - { - if(irecipe.recipeOutput.containsType((GasStack)results[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - for(SeparatorRecipe irecipe : getRecipes()) - { - if(irecipe.recipeInput.ingredient.isFluidEqual((FluidStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 11+7 && yAxis <= 69+7) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).fluidInput.ingredient)); - } - else if(xAxis >= 59 && xAxis <= 75 && yAxis >= 19+7 && yAxis <= 47+7) - { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).outputPair.leftGas.getGas().getLocalizedName()); - } - else if(xAxis >= 101 && xAxis <= 117 && yAxis >= 19+7 && yAxis <= 47+7) - { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).outputPair.rightGas.getGas().getLocalizedName()); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 11+7 && yAxis <= 69+7) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).fluidInput.ingredient; - } - else if(xAxis >= 59 && xAxis <= 75 && yAxis >= 19+7 && yAxis <= 47+7) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputPair.leftGas; - } - else if(xAxis >= 101 && xAxis <= 117 && yAxis >= 19+7 && yAxis <= 47+7) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputPair.rightGas; - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 11+7 && yAxis <= 69+7) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).fluidInput.ingredient; - } - else if(xAxis >= 59 && xAxis <= 75 && yAxis >= 19+7 && yAxis <= 47+7) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputPair.leftGas; - } - else if(xAxis >= 101 && xAxis <= 117 && yAxis >= 19+7 && yAxis <= 47+7) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputPair.rightGas; - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(button == 0) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public FluidInput fluidInput; - public ChemicalPairOutput outputPair; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(FluidInput input, ChemicalPairOutput pair) - { - fluidInput = input; - outputPair = pair; - } - - public CachedIORecipe(SeparatorRecipe recipe) - { - this(recipe.recipeInput, recipe.recipeOutput); - } - } -} diff --git a/legacy/mekanism.client.nei/ElementBoundHandler.java b/legacy/mekanism.client.nei/ElementBoundHandler.java deleted file mode 100644 index e0b455704..000000000 --- a/legacy/mekanism.client.nei/ElementBoundHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package mekanism.client.nei; - -import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.element.GuiElement; -import net.minecraft.client.gui.inventory.GuiContainer; -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.api.INEIGuiAdapter; - -public class ElementBoundHandler extends INEIGuiAdapter -{ - @Override - public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int width, int height) - { - if(gui instanceof GuiMekanism) - { - GuiMekanism guiMek = (GuiMekanism)gui; - - Rectangle4i rect = new Rectangle4i(x, y, width, height); - - for(GuiElement element : guiMek.guiElements) - { - if(element.getBounds(guiMek.getXPos(), guiMek.getYPos()).intersects(rect)) - { - return true; - } - } - } - - return false; - } -} diff --git a/legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java b/legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java deleted file mode 100644 index f32986f6b..000000000 --- a/legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; - -import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.EnrichmentRecipe; -import mekanism.common.util.LangUtils; - -public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.EnrichmentChamber.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.chamber"; - } - - @Override - public String getOverlayIdentifier() - { - return "chamber"; - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.BLUE; - } - - @Override - public Collection getRecipes() - { - return Recipe.ENRICHMENT_CHAMBER.get().values(); - } - - @Override - public Class getGuiClass() - { - return GuiEnrichmentChamber.class; - } -} diff --git a/legacy/mekanism.client.nei/MachineRecipeHandler.java b/legacy/mekanism.client.nei/MachineRecipeHandler.java deleted file mode 100644 index d9551fae2..000000000 --- a/legacy/mekanism.client.nei/MachineRecipeHandler.java +++ /dev/null @@ -1,164 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; -import java.util.Collection; - -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiSlot.SlotOverlay; -import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.recipe.machines.BasicMachineRecipe; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class MachineRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public abstract String getRecipeId(); - - public abstract Collection getRecipes(); - - public abstract ProgressBar getProgressType(); - - @Override - public void addGuiElements() - { - guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 16)); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.OUTPUT_LARGE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(12, 0, 28, 5, 144, 68); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -16, -5); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(63, 34, 24, 7), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(BasicMachineRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(BasicMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().output, result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiBasicMachine.png"; - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(BasicMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getInput().ingredient, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack input; - public PositionedStack output; - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - return output; - } - - public CachedIORecipe(ItemStack itemstack, ItemStack itemstack1) - { - super(); - - input = new PositionedStack(itemstack, 40, 12); - output = new PositionedStack(itemstack1, 100, 30); - } - - public CachedIORecipe(BasicMachineRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/MekanismSlotClickHandler.java b/legacy/mekanism.client.nei/MekanismSlotClickHandler.java deleted file mode 100644 index 229831a5b..000000000 --- a/legacy/mekanism.client.nei/MekanismSlotClickHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -package mekanism.client.nei; - -import mekanism.client.gui.GuiMekanism; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Slot; -import codechicken.nei.guihook.IContainerSlotClickHandler; - -public class MekanismSlotClickHandler implements IContainerSlotClickHandler -{ - @Override - public void beforeSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) - { - - } - - @Override - public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed) - { - if(gui instanceof GuiMekanism) - { - ((GuiMekanism)gui).handleMouse(slot, slotIndex, button, modifier); - return true; - } - - return false; - } - - @Override - public void afterSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) - { - - } -} diff --git a/legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java b/legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java deleted file mode 100644 index f8053382e..000000000 --- a/legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java +++ /dev/null @@ -1,257 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import mekanism.api.infuse.InfuseObject; -import mekanism.api.infuse.InfuseRegistry; -import mekanism.api.infuse.InfuseType; -import mekanism.client.gui.GuiMetallurgicInfuser; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiSlot.SlotOverlay; -import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - @Override - public void addGuiElements() - { - guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 16, 34)); - guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 50, 42)); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 142, 34).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 108, 42)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() { - @Override - public double getProgress() - { - return ticksPassed >= 40 ? (ticksPassed - 40) % 20 / 20.0F : 0.0F; - } - }, ProgressBar.MEDIUM, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 70, 46)); - } - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.MetallurgicInfuser.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "infuser"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiMetallurgicInfuser.png"; - } - - @Override - public Class getGuiClass() - { - return GuiMetallurgicInfuser.class; - } - - public String getRecipeId() - { - return "mekanism.infuser"; - } - - public List getInfuseStacks(InfuseType type) - { - List ret = new ArrayList(); - - for(Map.Entry obj : InfuseRegistry.getObjectMap().entrySet()) - { - if(obj.getValue().type == type) - { - ret.add(obj.getKey()); - } - } - - return ret; - } - - public Collection getRecipes() - { - return Recipe.METALLURGIC_INFUSER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(0, 0, 5, 15, 166, 56); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -5, -15); - } - } - - @Override - public void drawExtras(int i) - { - InfuseType type = ((CachedIORecipe)arecipes.get(i)).infusionType; - - float f = ticksPassed >= 20 && ticksPassed < 40 ? (ticksPassed - 20) % 20 / 20.0F : 1.0F; - if(ticksPassed < 20) f = 0.0F; - - int display = (int)(52F*f); - changeTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedRectFromIcon(2, 2+52-display, type.icon, 4, display); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(67, 32, 32, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(MetallurgicInfuserRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStacks(irecipe.getInput().infuse.type), irecipe.getInput().infuse.type)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public int recipiesPerPage() - { - return 2; - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(MetallurgicInfuserRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().output, result)) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStacks(irecipe.getInput().infuse.type), irecipe.getInput().infuse.type)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(MetallurgicInfuserRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getInput().inputStack, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStacks(irecipe.getInput().infuse.type), irecipe.getInput().infuse.type)); - } - - List infuses; - - for(ItemStack stack : getInfuseStacks(irecipe.getInput().infuse.type)) - { - if(NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)) - { - infuses = new ArrayList(); - infuses.add(stack); - arecipes.add(new CachedIORecipe(irecipe, infuses, irecipe.getInput().infuse.type)); - } - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public List infuseStacks; - - public PositionedStack inputStack; - public PositionedStack outputStack; - - public InfuseType infusionType; - - @Override - public PositionedStack getIngredient() - { - return inputStack; - } - - @Override - public PositionedStack getResult() - { - return outputStack; - } - - @Override - public PositionedStack getOtherStack() - { - return new PositionedStack(infuseStacks.get(cycleticks/40 % infuseStacks.size()), 12, 20); - } - - public CachedIORecipe(ItemStack input, ItemStack output, List infuses, InfuseType type) - { - super(); - - inputStack = new PositionedStack(input, 46, 28); - outputStack = new PositionedStack(output, 104, 28); - - infuseStacks = infuses; - - infusionType = type; - } - - public CachedIORecipe(MetallurgicInfuserRecipe recipe, List infuses, InfuseType type) - { - this(recipe.getInput().inputStack, recipe.getOutput().output, infuses, type); - } - } -} diff --git a/legacy/mekanism.client.nei/NEIMekanismConfig.java b/legacy/mekanism.client.nei/NEIMekanismConfig.java deleted file mode 100644 index cecb68de5..000000000 --- a/legacy/mekanism.client.nei/NEIMekanismConfig.java +++ /dev/null @@ -1,132 +0,0 @@ -package mekanism.client.nei; - -import mekanism.client.gui.GuiChemicalCrystallizer; -import mekanism.client.gui.GuiChemicalDissolutionChamber; -import mekanism.client.gui.GuiChemicalInfuser; -import mekanism.client.gui.GuiChemicalInjectionChamber; -import mekanism.client.gui.GuiChemicalOxidizer; -import mekanism.client.gui.GuiChemicalWasher; -import mekanism.client.gui.GuiCombiner; -import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.GuiElectrolyticSeparator; -import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.GuiMetallurgicInfuser; -import mekanism.client.gui.GuiOsmiumCompressor; -import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.GuiPrecisionSawmill; -import mekanism.client.gui.GuiPurificationChamber; -import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.client.gui.GuiSolarNeutronActivator; -import mekanism.client.gui.GuiThermalEvaporationController; -import mekanism.common.MekanismBlocks; -import mekanism.common.MekanismItems; -import net.minecraft.item.ItemStack; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import codechicken.nei.guihook.GuiContainerManager; - -public class NEIMekanismConfig implements IConfigureNEI -{ - @Override - public void loadConfig() - { - API.registerRecipeHandler(new EnrichmentChamberRecipeHandler()); - API.registerUsageHandler(new EnrichmentChamberRecipeHandler()); - - API.registerRecipeHandler(new OsmiumCompressorRecipeHandler()); - API.registerUsageHandler(new OsmiumCompressorRecipeHandler()); - - API.registerRecipeHandler(new CrusherRecipeHandler()); - API.registerUsageHandler(new CrusherRecipeHandler()); - - API.registerRecipeHandler(new CombinerRecipeHandler()); - API.registerUsageHandler(new CombinerRecipeHandler()); - - API.registerRecipeHandler(new MetallurgicInfuserRecipeHandler()); - API.registerUsageHandler(new MetallurgicInfuserRecipeHandler()); - - API.registerRecipeHandler(new PurificationChamberRecipeHandler()); - API.registerUsageHandler(new PurificationChamberRecipeHandler()); - - API.registerRecipeHandler(new ChemicalInjectionChamberRecipeHandler()); - API.registerUsageHandler(new ChemicalInjectionChamberRecipeHandler()); - - API.registerRecipeHandler(new ChemicalOxidizerRecipeHandler()); - API.registerUsageHandler(new ChemicalOxidizerRecipeHandler()); - - API.registerRecipeHandler(new ChemicalInfuserRecipeHandler()); - API.registerUsageHandler(new ChemicalInfuserRecipeHandler()); - - API.registerRecipeHandler(new RotaryCondensentratorRecipeHandler()); - API.registerUsageHandler(new RotaryCondensentratorRecipeHandler()); - - API.registerRecipeHandler(new ElectrolyticSeparatorRecipeHandler()); - API.registerUsageHandler(new ElectrolyticSeparatorRecipeHandler()); - - API.registerRecipeHandler(new PrecisionSawmillRecipeHandler()); - API.registerUsageHandler(new PrecisionSawmillRecipeHandler()); - - API.registerRecipeHandler(new ThermalEvaporationRecipeHandler()); - API.registerUsageHandler(new ThermalEvaporationRecipeHandler()); - - API.registerRecipeHandler(new ChemicalDissolutionChamberRecipeHandler()); - API.registerUsageHandler(new ChemicalDissolutionChamberRecipeHandler()); - - API.registerRecipeHandler(new ChemicalWasherRecipeHandler()); - API.registerUsageHandler(new ChemicalWasherRecipeHandler()); - - API.registerRecipeHandler(new ChemicalCrystallizerRecipeHandler()); - API.registerUsageHandler(new ChemicalCrystallizerRecipeHandler()); - - API.registerRecipeHandler(new PRCRecipeHandler()); - API.registerUsageHandler(new PRCRecipeHandler()); - - API.registerRecipeHandler(new SolarNeutronRecipeHandler()); - API.registerUsageHandler(new SolarNeutronRecipeHandler()); - - API.registerRecipeHandler(new ShapedMekanismRecipeHandler()); - API.registerUsageHandler(new ShapedMekanismRecipeHandler()); - - API.registerRecipeHandler(new ShapelessMekanismRecipeHandler()); - API.registerUsageHandler(new ShapelessMekanismRecipeHandler()); - - API.setGuiOffset(GuiEnrichmentChamber.class, 16, 6); - API.setGuiOffset(GuiOsmiumCompressor.class, 16, 6); - API.setGuiOffset(GuiCrusher.class, 16, 6); - API.setGuiOffset(GuiCombiner.class, 16, 6); - API.setGuiOffset(GuiPurificationChamber.class, 16, 6); - API.setGuiOffset(GuiChemicalInjectionChamber.class, 16, 6); - API.setGuiOffset(GuiMetallurgicInfuser.class, 5, 15); - API.setGuiOffset(GuiChemicalOxidizer.class, ChemicalOxidizerRecipeHandler.xOffset, ChemicalOxidizerRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalInfuser.class, ChemicalInfuserRecipeHandler.xOffset, ChemicalInfuserRecipeHandler.yOffset); - API.setGuiOffset(GuiRotaryCondensentrator.class, RotaryCondensentratorRecipeHandler.xOffset, RotaryCondensentratorRecipeHandler.yOffset); - API.setGuiOffset(GuiElectrolyticSeparator.class, ElectrolyticSeparatorRecipeHandler.xOffset, ElectrolyticSeparatorRecipeHandler.yOffset); - API.setGuiOffset(GuiPrecisionSawmill.class, 16, 6); - API.setGuiOffset(GuiThermalEvaporationController.class, ThermalEvaporationRecipeHandler.xOffset, ThermalEvaporationRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalDissolutionChamber.class, ChemicalDissolutionChamberRecipeHandler.xOffset, ChemicalDissolutionChamberRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalWasher.class, ChemicalWasherRecipeHandler.xOffset, ChemicalWasherRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalCrystallizer.class, ChemicalCrystallizerRecipeHandler.xOffset, ChemicalCrystallizerRecipeHandler.yOffset); - API.setGuiOffset(GuiPRC.class, PRCRecipeHandler.xOffset, PRCRecipeHandler.yOffset); - API.setGuiOffset(GuiThermalEvaporationController.class, ThermalEvaporationRecipeHandler.xOffset, ThermalEvaporationRecipeHandler.yOffset); - API.setGuiOffset(GuiSolarNeutronActivator.class, SolarNeutronRecipeHandler.xOffset, SolarNeutronRecipeHandler.yOffset); - - GuiContainerManager.addSlotClickHandler(new MekanismSlotClickHandler()); - - API.registerNEIGuiHandler(new ElementBoundHandler()); - - API.hideItem(new ItemStack(MekanismBlocks.BoundingBlock)); - API.hideItem(new ItemStack(MekanismItems.ItemProxy)); - } - - @Override - public String getName() - { - return "Mekanism NEI Plugin"; - } - - @Override - public String getVersion() - { - return "8.0.0"; - } -} diff --git a/legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java b/legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java deleted file mode 100644 index 2b6fb30a6..000000000 --- a/legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java +++ /dev/null @@ -1,59 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiOsmiumCompressor; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.MekanismItems; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.OsmiumCompressorRecipe; -import mekanism.common.util.LangUtils; -import net.minecraft.item.ItemStack; - -public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.OsmiumCompressor.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.compressor"; - } - - @Override - public String getOverlayIdentifier() - { - return "compressor"; - } - - @Override - public Collection getRecipes() - { - return Recipe.OSMIUM_COMPRESSOR.get().values(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.RED; - } - - @Override - public List getFuelStacks(Gas gasType) - { - return ListUtils.asList(new ItemStack(MekanismItems.Ingot, 1, 1)); - } - - @Override - public Class getGuiClass() - { - return GuiOsmiumCompressor.class; - } -} diff --git a/legacy/mekanism.client.nei/PRCRecipeHandler.java b/legacy/mekanism.client.nei/PRCRecipeHandler.java deleted file mode 100644 index 4dbb1484b..000000000 --- a/legacy/mekanism.client.nei/PRCRecipeHandler.java +++ /dev/null @@ -1,443 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiSlot.SlotOverlay; -import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.PressurizedInput; -import mekanism.common.recipe.machines.PressurizedRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class PRCRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public GuiFluidGauge fluidInput; - public GuiGasGauge gasInput; - public GuiGasGauge gasOutput; - - public static int xOffset = 5; - public static int yOffset = 11; - - @Override - public void addGuiElements() - { - guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 53, 34)); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 140, 18).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 115, 34)); - - guiElements.add(fluidInput = GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 5, 10)); - guiElements.add(gasInput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 28, 10)); - guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 140, 40)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 75, 37)); - } - - public ProgressBar getProgressType() - { - return ProgressBar.MEDIUM; - } - - public Set> getRecipes() - { - return Recipe.PRESSURIZED_REACTION_CHAMBER.get().entrySet(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 68); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(75-xOffset, 37-yOffset, 36, 10), getRecipeId(), new Object[0])); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.PressurizedReactionChamber.short.name"); - } - - @Override - public Class getGuiClass() - { - return GuiPRC.class; - } - - @Override - public String getOverlayIdentifier() - { - return "prc"; - } - - @Override - public int recipiesPerPage() - { - return 2; - } - - public String getRecipeId() - { - return "mekanism.prc"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiPRC.png"; - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.pressurizedRecipe.getInput().getFluid() != null) - { - fluidInput.setDummyType(recipe.pressurizedRecipe.getInput().getFluid().getFluid()); - fluidInput.renderScale(0, 0, -xOffset, -yOffset); - } - - if(recipe.pressurizedRecipe.getInput().getGas() != null) - { - gasInput.setDummyType(recipe.pressurizedRecipe.getInput().getGas().getGas()); - gasInput.renderScale(0, 0, -xOffset, -yOffset); - } - - if(recipe.pressurizedRecipe.getOutput().getGasOutput() != null) - { - gasOutput.setDummyType(recipe.pressurizedRecipe.getOutput().getGasOutput().getGas()); - gasOutput.renderScale(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(Map.Entry irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(Map.Entry irecipe : getRecipes()) - { - if(irecipe.getValue().getOutput().getGasOutput().isGasEqual((GasStack)results[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getValue().getOutput().getItemOutput(), result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(Map.Entry irecipe : getRecipes()) - { - if(irecipe.getKey().containsType((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - for(Map.Entry irecipe : getRecipes()) - { - if(irecipe.getKey().containsType((FluidStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getKey().getSolid(), ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 6-5 && xAxis <= 22-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getFluid())); - } - else if(xAxis >= 29-5 && xAxis <= 45-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getGas())); - } - else if(xAxis >= 141-5 && xAxis <= 157-5 && yAxis >= 41-10 && yAxis <= 69-10) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getOutput().getGasOutput())); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6-5 && xAxis <= 22-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getFluid(); - } - else if(xAxis >= 29-5 && xAxis <= 45-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getGas(); - } - else if(xAxis >= 141-5 && xAxis <= 157-5 && yAxis >= 41-10 && yAxis <= 69-10) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getOutput().getGasOutput(); - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6-5 && xAxis <= 22-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getFluid(); - } - else if(xAxis >= 29-5 && xAxis <= 45-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getGas(); - } - else if(xAxis >= 141-5 && xAxis <= 157-5 && yAxis >= 41-10 && yAxis <= 69-10) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getOutput().getGasOutput(); - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(button == 0) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PressurizedRecipe pressurizedRecipe; - - public PositionedStack input; - public PositionedStack output; - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - return output; - } - - public CachedIORecipe(PressurizedRecipe recipe) - { - super(); - - pressurizedRecipe = recipe; - - input = new PositionedStack(recipe.getInput().getSolid(), 54-xOffset, 35-yOffset); - output = new PositionedStack(recipe.getOutput().getItemOutput(), 116-xOffset, 35-yOffset); - } - - public CachedIORecipe(Map.Entry recipe) - { - this((PressurizedRecipe)recipe.getValue()); - } - } -} diff --git a/legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java b/legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java deleted file mode 100644 index 9d3442119..000000000 --- a/legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; - -import mekanism.client.gui.GuiPrecisionSawmill; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.SawmillRecipe; -import mekanism.common.util.LangUtils; - -public class PrecisionSawmillRecipeHandler extends ChanceMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.PrecisionSawmill.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.precisionsawmill"; - } - - @Override - public String getOverlayIdentifier() - { - return "precisionsawmill"; - } - - @Override - public Collection getRecipes() - { - return Recipe.PRECISION_SAWMILL.get().values(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.PURPLE; - } - - @Override - public Class getGuiClass() - { - return GuiPrecisionSawmill.class; - } -} diff --git a/legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java b/legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java deleted file mode 100644 index db1e61bca..000000000 --- a/legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java +++ /dev/null @@ -1,71 +0,0 @@ -package mekanism.client.nei; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiPurificationChamber; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.Tier.GasTankTier; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.PurificationRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.PurificationChamber.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.purificationchamber"; - } - - @Override - public String getOverlayIdentifier() - { - return "purificationchamber"; - } - - @Override - public Collection getRecipes() - { - return Recipe.PURIFICATION_CHAMBER.get().values(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.RED; - } - - @Override - public List getFuelStacks(Gas gasType) - { - if(gasType == GasRegistry.getGas("oxygen")) - { - for(GasTankTier tier : GasTankTier.values()) - { - return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("oxygen"))); - } - } - - return new ArrayList(); - } - - @Override - public Class getGuiClass() - { - return GuiPurificationChamber.class; - } -} diff --git a/legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java b/legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java deleted file mode 100644 index 03afb2ae3..000000000 --- a/legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java +++ /dev/null @@ -1,347 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.common.ObfuscatedNames; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 12; - - @Override - public String getRecipeName() - { - return LangUtils.localize("nei.rotaryCondensentrator"); - } - - @Override - public String getOverlayIdentifier() - { - return "rotarycondensentrator"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiRotaryCondensentrator.png"; - } - - @Override - public Class getGuiClass() - { - return GuiRotaryCondensentrator.class; - } - - public String getRecipeId() - { - return "mekanism.rotarycondensentrator"; - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 71); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.type) - { - drawTexturedModalRect(64-xOffset, 39-yOffset, 176, 123, 48, 8); - } - else { - drawTexturedModalRect(64-xOffset, 39-yOffset, 176, 115, 48, 8); - } - - if(recipe.gasStack != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 40, 58, null, recipe.gasStack); - } - - if(recipe.fluidStack != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 40, 58, recipe.fluidStack, null); - } - - drawString(recipe.type ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-xOffset, 74-yOffset, 0x404040, false); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(64-xOffset, 39-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(Gas gas : GasRegistry.getRegisteredGasses()) - { - if(gas.hasFluid()) - { - arecipes.add(new CachedIORecipe(new GasStack(gas, 1), new FluidStack(gas.getFluid(), 1), true)); - arecipes.add(new CachedIORecipe(new GasStack(gas, 1), new FluidStack(gas.getFluid(), 1), false)); - } - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - GasStack gas = (GasStack)results[0]; - - if(gas.getGas().hasFluid()) - { - arecipes.add(new CachedIORecipe(new GasStack(gas.getGas(), 1), new FluidStack(gas.getGas().getFluid(), 1), false)); - } - } - else if(outputId.equals("fluid") && results.length == 1 && results[0] instanceof FluidStack) - { - FluidStack fluid = (FluidStack)results[0]; - Gas gas = GasRegistry.getGas(fluid.getFluid()); - - if(gas != null) - { - arecipes.add(new CachedIORecipe(new GasStack(gas, 1), new FluidStack(fluid.getFluid(), 1), true)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - GasStack gas = (GasStack)ingredients[0]; - - if(gas.getGas().hasFluid()) - { - arecipes.add(new CachedIORecipe(new GasStack(gas.getGas(), 1), new FluidStack(gas.getGas().getFluid(), 1), true)); - } - } - else if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - FluidStack fluid = (FluidStack)ingredients[0]; - Gas gas = GasRegistry.getGas(fluid.getFluid()); - - if(gas != null) - { - arecipes.add(new CachedIORecipe(new GasStack(gas, 1), new FluidStack(fluid.getFluid(), 1), false)); - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).gasStack)); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).fluidStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).gasStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).fluidStack; - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+18 && yAxis <= 72+18) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).gasStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+18 && yAxis <= 72+18) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).fluidStack; - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(button == 0) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public GasStack gasStack; - public FluidStack fluidStack; - - /* true = condensentrating, false = decondensentrating */ - public boolean type; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(GasStack gas, FluidStack fluid, boolean b) - { - gasStack = gas; - fluidStack = fluid; - type = b; - } - } -} diff --git a/legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java b/legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java deleted file mode 100644 index 0c87a628a..000000000 --- a/legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java +++ /dev/null @@ -1,156 +0,0 @@ -package mekanism.client.nei; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import mekanism.common.recipe.ShapedMekanismRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.RecipeUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapedRecipeHandler; - -public class ShapedMekanismRecipeHandler extends ShapedRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Mekanism " + LangUtils.localize("recipe.mekanismShaped"); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals("crafting") && getClass() == ShapedMekanismRecipeHandler.class) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapedMekanismRecipe) - { - ShapedMekanismRecipe mekanismRecipe = (ShapedMekanismRecipe)irecipe; - CachedShapedMekanismRecipe recipe = new CachedShapedMekanismRecipe(mekanismRecipe); - - recipe.computeVisuals(); - arecipes.add(recipe); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapedMekanismRecipe && RecipeUtils.areItemsEqualForCrafting(irecipe.getRecipeOutput(), result)) - { - ShapedMekanismRecipe mekanismRecipe = (ShapedMekanismRecipe)irecipe; - CachedShapedMekanismRecipe recipe = new CachedShapedMekanismRecipe(mekanismRecipe); - - recipe.computeVisuals(); - arecipes.add(recipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapedMekanismRecipe) - { - ShapedMekanismRecipe mekanismRecipe = (ShapedMekanismRecipe)irecipe; - CachedShapedMekanismRecipe recipe = new CachedShapedMekanismRecipe(mekanismRecipe); - - recipe.computeVisuals(); - - if(recipe.contains(recipe.ingredients, ingredient)) - { - recipe.setIngredientPermutation(recipe.ingredients, ingredient); - arecipes.add(recipe); - } - } - } - } - - public class CachedShapedMekanismRecipe extends CachedRecipe - { - public ArrayList ingredients; - public PositionedStack result; - - public CachedShapedMekanismRecipe(ShapedMekanismRecipe recipe) - { - result = new PositionedStack(recipe.getRecipeOutput(), 119, 24); - ingredients = new ArrayList(); - setIngredients(recipe.width, recipe.height, recipe.getInput()); - } - - public void setIngredients(int width, int height, Object[] items) - { - for(int x = 0; x < width; x++) - { - for(int y = 0; y < height; y++) - { - if(items[y*width+x] == null) - { - continue; - } - - PositionedStack stack = new PositionedStack(items[y*width+x], 25+x*18, 6+y*18); - stack.setMaxSize(1); - ingredients.add(stack); - } - } - } - - @Override - public List getIngredients() - { - return getCycledIngredients(cycleticks / 20, ingredients); - } - - @Override - public PositionedStack getResult() - { - return result; - } - - public void computeVisuals() - { - for(PositionedStack p : ingredients) - { - p.generatePermutations(); - } - } - - @Override - public boolean contains(Collection ingredients, ItemStack ingredient) - { - for(PositionedStack stack : ingredients) - { - for(ItemStack item : stack.items) - { - if(RecipeUtils.areItemsEqualForCrafting(item, ingredient)) - { - return true; - } - } - } - - return false; - } - } -} diff --git a/legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java b/legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java deleted file mode 100644 index f3cecc9a5..000000000 --- a/legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java +++ /dev/null @@ -1,125 +0,0 @@ -package mekanism.client.nei; - -import java.util.ArrayList; -import java.util.List; - -import mekanism.common.recipe.ShapelessMekanismRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.RecipeUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapelessRecipeHandler; - -public class ShapelessMekanismRecipeHandler extends ShapelessRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Mekanism " + LangUtils.localize("recipe.mekanismShapeless"); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals("crafting") && getClass() == ShapelessMekanismRecipeHandler.class) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapelessMekanismRecipe) - { - ShapelessMekanismRecipe mekanismRecipe = (ShapelessMekanismRecipe)irecipe; - CachedShapelessMekanismRecipe recipe = new CachedShapelessMekanismRecipe(mekanismRecipe); - - arecipes.add(recipe); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapelessMekanismRecipe && RecipeUtils.areItemsEqualForCrafting(irecipe.getRecipeOutput(), result)) - { - ShapelessMekanismRecipe mekanismRecipe = (ShapelessMekanismRecipe)irecipe; - CachedShapelessMekanismRecipe recipe = new CachedShapelessMekanismRecipe(mekanismRecipe); - - arecipes.add(recipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapelessMekanismRecipe) - { - ShapelessMekanismRecipe mekanismRecipe = (ShapelessMekanismRecipe)irecipe; - CachedShapelessMekanismRecipe recipe = new CachedShapelessMekanismRecipe(mekanismRecipe); - - if(recipe.contains(recipe.ingredients, ingredient)) - { - recipe.setIngredientPermutation(recipe.ingredients, ingredient); - arecipes.add(recipe); - } - } - } - } - - public class CachedShapelessMekanismRecipe extends CachedRecipe - { - public ArrayList ingredients; - public PositionedStack result; - - public CachedShapelessMekanismRecipe(ShapelessMekanismRecipe recipe) - { - result = new PositionedStack(recipe.getRecipeOutput(), 119, 24); - ingredients = new ArrayList(); - setIngredients(recipe.getInput()); - } - - public void setIngredients(List items) - { - ingredients.clear(); - - for(int x = 0; x < items.size(); x++) - { - PositionedStack stack = new PositionedStack(items.get(x), 25 + stackorder[x][0] * 18, 6 + stackorder[x][1] * 18); - stack.setMaxSize(1); - ingredients.add(stack); - } - } - - public void setResult(ItemStack output) - { - result = new PositionedStack(output, 119, 24); - } - - @Override - public List getIngredients() - { - return getCycledIngredients(cycleticks / 20, ingredients); - } - - @Override - public PositionedStack getResult() - { - return result; - } - } -} diff --git a/legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java b/legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java deleted file mode 100644 index f7d2b88c2..000000000 --- a/legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java +++ /dev/null @@ -1,286 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiSolarNeutronActivator; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.SolarNeutronRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class SolarNeutronRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 12; - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock3.SolarNeutronActivator.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "solarneutron"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiSolarNeutronActivator.png"; - } - - @Override - public Class getGuiClass() - { - return GuiSolarNeutronActivator.class; - } - - public String getRecipeId() - { - return "mekanism.solarneutron"; - } - - public Collection getRecipes() - { - return Recipe.SOLAR_NEUTRON_ACTIVATOR.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 70); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - drawTexturedModalRect(64-xOffset, 39-yOffset, 176, 58, 55, 8); - - if(recipe.inputStack != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 0, 58, null, recipe.inputStack); - } - - if(recipe.inputStack != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 0, 58, null, recipe.outputStack); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(64-xOffset, 39-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(SolarNeutronRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(SolarNeutronRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(SolarNeutronRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().ingredient.isGasEqual((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).inputStack)); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+18 && yAxis <= 72+18) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+18 && yAxis <= 72+18) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public GasStack inputStack; - public GasStack outputStack; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(GasStack input, GasStack output) - { - inputStack = input; - outputStack = output; - } - - public CachedIORecipe(SolarNeutronRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java b/legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java deleted file mode 100644 index bf924aae7..000000000 --- a/legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java +++ /dev/null @@ -1,286 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.client.gui.GuiThermalEvaporationController; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.ThermalEvaporationRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ThermalEvaporationRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 12; - - @Override - public String getRecipeName() - { - return LangUtils.localize("gui.thermalEvaporationController.short"); - } - - @Override - public String getOverlayIdentifier() - { - return "thermalevaporation"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiThermalEvaporationController.png"; - } - - @Override - public Class getGuiClass() - { - return GuiThermalEvaporationController.class; - } - - public String getRecipeId() - { - return "mekanism.thermalevaporation"; - } - - public Collection getRecipes() - { - return Recipe.THERMAL_EVAPORATION_PLANT.get().values(); - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(49-xOffset, 20-yOffset, 78, 38), getRecipeId(), new Object[0])); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 62); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - drawProgressBar(49-xOffset, 64-yOffset, 176, 59, 78, 8, ticksPassed < 20 ? ticksPassed % 20 / 20.0F : 1.0F, 0); - - if(recipe.fluidInput != null) - { - displayGauge(58, 7-xOffset, 14-yOffset, 176, 0, 58, recipe.fluidInput, null); - } - - if(recipe.fluidOutput != null) - { - displayGauge(58, 153-xOffset, 14-yOffset, 176, 0, 58, recipe.fluidOutput, null); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(ThermalEvaporationRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("fluid") && results.length == 1 && results[0] instanceof FluidStack) - { - for(ThermalEvaporationRecipe irecipe : getRecipes()) - { - if(((FluidStack)results[0]).isFluidEqual(irecipe.recipeOutput.output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - for(ThermalEvaporationRecipe irecipe : getRecipes()) - { - if(irecipe.recipeInput.ingredient.isFluidEqual((FluidStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe) arecipes.get(recipe)).fluidInput)); - } - else if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe) arecipes.get(recipe)).fluidOutput)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - FluidStack stack = null; - - if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).fluidInput; - } - else if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).fluidOutput; - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - FluidStack stack = null; - - if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).fluidInput; - } - else if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).fluidOutput; - } - - if(stack != null) - { - if(button == 0) - { - if(doFluidLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public FluidStack fluidInput; - public FluidStack fluidOutput; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(FluidStack input, FluidStack output) - { - fluidInput = input; - fluidOutput = output; - } - - public CachedIORecipe(ThermalEvaporationRecipe recipe) - { - this((FluidStack)recipe.recipeInput.ingredient, (FluidStack)recipe.recipeOutput.output); - } - } -} diff --git a/legacy/mekanism.client.render.block/BasicRenderingHandler.java b/legacy/mekanism.client.render.block/BasicRenderingHandler.java deleted file mode 100644 index 1584e582c..000000000 --- a/legacy/mekanism.client.render.block/BasicRenderingHandler.java +++ /dev/null @@ -1,92 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.client.ClientProxy; -import mekanism.client.model.ModelSecurityDesk; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.MekanismBlocks; -import mekanism.common.block.BlockBasic.BasicType; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class BasicRenderingHandler implements ISimpleBlockRenderingHandler -{ - private Minecraft mc = Minecraft.getMinecraft(); - - public ModelSecurityDesk securityDesk = new ModelSecurityDesk(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - GL11.glPushMatrix(); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - - BasicType type = BasicType.get(block, metadata); - - if(type != null) - { - if(type == BasicType.STRUCTURAL_GLASS) - { - MekanismRenderer.blendOn(); - } - - if(type != BasicType.SECURITY_DESK) - { - GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); - MekanismRenderer.renderItem(renderer, metadata, block); - } - else { - GL11.glRotatef(180, 1.0F, 0.0F, 0.0F); - GL11.glScalef(0.8F, 0.8F, 0.8F); - GL11.glTranslatef(0.0F, -0.8F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); - securityDesk.render(0.0625F, mc.renderEngine); - } - - if(type == BasicType.STRUCTURAL_GLASS) - { - MekanismRenderer.blendOff(); - } - } - - GL11.glPopMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - if(block == MekanismBlocks.BasicBlock || block == MekanismBlocks.BasicBlock2) - { - int metadata = world.getBlockMetadata(x, y, z); - - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBoundsFromBlock(block); - - return true; - } - - return false; - } - - @Override - public int getRenderId() - { - return ClientProxy.BASIC_RENDER_ID; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) - { - return true; - } -} diff --git a/legacy/mekanism.client.render.block/CTMRenderingHandler.java b/legacy/mekanism.client.render.block/CTMRenderingHandler.java deleted file mode 100644 index b41e830b5..000000000 --- a/legacy/mekanism.client.render.block/CTMRenderingHandler.java +++ /dev/null @@ -1,102 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.api.MekanismConfig; -import mekanism.client.ClientProxy; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.CTMData; -import mekanism.common.base.IBlockCTM; -import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.tile.TileEntityBasicBlock; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -/** - * CTM ISBRH adapted from Chisel - * Code licensed under GPLv2 - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class CTMRenderingHandler implements ISimpleBlockRenderingHandler -{ - RenderBlocksCTM rendererCTM = new RenderBlocksCTM(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - MekanismRenderer.renderItem(renderer, metadata, block); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) - { - int meta = world.getBlockMetadata(x, y, z); - - if(block instanceof IBlockCTM && !((IBlockCTM)block).shouldRenderBlock(world, x, y, z, meta)) - { - return false; - } - - CTMData blockCTM = ((IBlockCTM)block).getCTMData(world, x, y, z, meta); - - if(MekanismConfig.client.renderCTM && blockCTM != null) - { - if(blockCTM.hasFacingOverride() && world.getTileEntity(x, y, z) instanceof TileEntityBasicBlock) - { - TileEntityBasicBlock tile = (TileEntityBasicBlock)world.getTileEntity(x, y, z); - blockCTM.setFacing(tile.facing); - } - - rendererCTM.blockAccess = world; - rendererCTM.renderMaxX = 1.0; - rendererCTM.renderMaxY = 1.0; - rendererCTM.renderMaxZ = 1.0; - - rendererCTM.dataCTM = blockCTM; - - rendererCTM.rendererOld = rendererOld; - - return rendererCTM.renderStandardBlock(block, x, y, z); - } - - if(MachineType.get(block, meta) != null) - { - TileEntity tile = world.getTileEntity(x, y, z); - - int prevRotateTop = rendererOld.uvRotateTop; - int prevRotateBottom = rendererOld.uvRotateBottom; - - if(tile instanceof TileEntityBasicBlock) - { - if(((TileEntityBasicBlock)tile).facing >= 2) - { - rendererOld.uvRotateTop = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; - rendererOld.uvRotateBottom = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; - } - } - - rendererOld.renderStandardBlock(block, x, y, z); - rendererOld.setRenderBoundsFromBlock(block); - - rendererOld.uvRotateTop = prevRotateTop; - rendererOld.uvRotateBottom = prevRotateBottom; - - return true; - } - - return rendererOld.renderStandardBlock(block, x, y, z); - } - - @Override - public boolean shouldRender3DInInventory(int renderId) - { - return true; - } - - @Override - public int getRenderId() - { - return ClientProxy.CTM_RENDER_ID; - } -} diff --git a/legacy/mekanism.client.render.block/MachineRenderingHandler.java b/legacy/mekanism.client.render.block/MachineRenderingHandler.java deleted file mode 100644 index 624387e88..000000000 --- a/legacy/mekanism.client.render.block/MachineRenderingHandler.java +++ /dev/null @@ -1,272 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.client.ClientProxy; -import mekanism.client.model.ModelChargepad; -import mekanism.client.model.ModelChemicalCrystallizer; -import mekanism.client.model.ModelChemicalDissolutionChamber; -import mekanism.client.model.ModelChemicalInfuser; -import mekanism.client.model.ModelChemicalOxidizer; -import mekanism.client.model.ModelChemicalWasher; -import mekanism.client.model.ModelDigitalMiner; -import mekanism.client.model.ModelElectricPump; -import mekanism.client.model.ModelElectrolyticSeparator; -import mekanism.client.model.ModelFluidicPlenisher; -import mekanism.client.model.ModelLaser; -import mekanism.client.model.ModelLaserAmplifier; -import mekanism.client.model.ModelLogisticalSorter; -import mekanism.client.model.ModelMetallurgicInfuser; -import mekanism.client.model.ModelPressurizedReactionChamber; -import mekanism.client.model.ModelQuantumEntangloporter; -import mekanism.client.model.ModelResistiveHeater; -import mekanism.client.model.ModelRotaryCondensentrator; -import mekanism.client.model.ModelSeismicVibrator; -import mekanism.client.model.ModelSolarNeutronActivator; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class MachineRenderingHandler implements ISimpleBlockRenderingHandler -{ - private Minecraft mc = Minecraft.getMinecraft(); - - public ModelElectricPump electricPump = new ModelElectricPump(); - public ModelMetallurgicInfuser metallurgicInfuser = new ModelMetallurgicInfuser(); - public ModelChargepad chargepad = new ModelChargepad(); - public ModelLogisticalSorter logisticalSorter = new ModelLogisticalSorter(); - public ModelDigitalMiner digitalMiner = new ModelDigitalMiner(); - public ModelRotaryCondensentrator rotaryCondensentrator = new ModelRotaryCondensentrator(); - public ModelChemicalOxidizer chemicalOxidizer = new ModelChemicalOxidizer(); - public ModelChemicalInfuser chemicalInfuser = new ModelChemicalInfuser(); - public ModelElectrolyticSeparator electrolyticSeparator = new ModelElectrolyticSeparator(); - public ModelChemicalDissolutionChamber chemicalDissolutionChamber = new ModelChemicalDissolutionChamber(); - public ModelChemicalWasher chemicalWasher = new ModelChemicalWasher(); - public ModelChemicalCrystallizer chemicalCrystallizer = new ModelChemicalCrystallizer(); - public ModelSeismicVibrator seismicVibrator = new ModelSeismicVibrator(); - public ModelPressurizedReactionChamber pressurizedReactionChamber = new ModelPressurizedReactionChamber(); - public ModelFluidicPlenisher fluidicPlenisher = new ModelFluidicPlenisher(); - public ModelLaser laser = new ModelLaser(); - public ModelLaserAmplifier laserAmplifier = new ModelLaserAmplifier(); - public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); - public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); - public ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - if(block == null || renderer == null || MachineType.get(block, metadata) == null) - { - return; - } - - GL11.glPushMatrix(); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - - MachineType type = MachineType.get(block, metadata); - - if(type == MachineType.ELECTRIC_PUMP) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); - electricPump.render(0.0560F); - } - else if(type == MachineType.METALLURGIC_INFUSER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); - metallurgicInfuser.render(0.0625F); - } - else if(type == MachineType.CHARGEPAD) - { - GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.1F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); - chargepad.render(0.0625F, mc.renderEngine); - } - else if(type == MachineType.LOGISTICAL_SORTER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); - logisticalSorter.render(0.0625F, false); - } - else if(type == MachineType.DIGITAL_MINER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.35F, 0.1F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); - digitalMiner.render(0.022F, false, mc.renderEngine); - } - else if(type == MachineType.ROTARY_CONDENSENTRATOR) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); - rotaryCondensentrator.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_OXIDIZER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.00F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); - chemicalOxidizer.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_INFUSER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180f, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); - chemicalInfuser.render(0.0625F); - } - else if(type == MachineType.ELECTROLYTIC_SEPARATOR) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); - GL11.glTranslated(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); - electrolyticSeparator.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); - chemicalDissolutionChamber.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_WASHER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); - chemicalWasher.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_CRYSTALLIZER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); - chemicalCrystallizer.render(0.0625F); - } - else if(type == MachineType.SEISMIC_VIBRATOR) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.55F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); - seismicVibrator.render(0.0625F); - } - else if(type == MachineType.PRESSURIZED_REACTION_CHAMBER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); - pressurizedReactionChamber.render(0.0625F); - } - else if(type == MachineType.FLUIDIC_PLENISHER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); - fluidicPlenisher.render(0.0560F); - } - else if(type == MachineType.LASER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); - laser.render(0.0560F); - } - else if(type == MachineType.LASER_AMPLIFIER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); - laserAmplifier.render(0.0560F); - } - else if(type == MachineType.LASER_TRACTOR_BEAM) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); - laserAmplifier.render(0.0560F); - } - else if(type == MachineType.RESISTIVE_HEATER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); - resistiveHeater.render(0.0625F, false, mc.renderEngine); - } - else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.55F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); - solarNeutronActivator.render(0.0625F); - } - else if(type == MachineType.QUANTUM_ENTANGLOPORTER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); - quantumEntangloporter.render(0.0625F, mc.renderEngine); - } - else { - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - MekanismRenderer.renderItem(renderer, metadata, block); - } - - GL11.glPopMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - //Handled by CTMRenderingHandler - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) - { - return true; - } - - @Override - public int getRenderId() - { - return ClientProxy.MACHINE_RENDER_ID; - } -} diff --git a/legacy/mekanism.client.render.block/PlasticRenderingHandler.java b/legacy/mekanism.client.render.block/PlasticRenderingHandler.java deleted file mode 100644 index 3f13ae1f5..000000000 --- a/legacy/mekanism.client.render.block/PlasticRenderingHandler.java +++ /dev/null @@ -1,96 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.client.ClientProxy; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.MekanismBlocks; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler -{ - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - MekanismRenderer.renderItem(renderer, metadata, block); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - boolean flag = false; - - if(block == MekanismBlocks.GlowPlasticBlock) - { - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(240); - int meta = world.getBlockMetadata(x, y, z); - int l = block.getRenderColor(meta); - int r = l >> 16 & 0xFF; - int g = l >> 8 & 0xFF; - int b = l & 0xFF; - tessellator.setColorOpaque(r, g, b); - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y - 1, z, 0))) - { - renderer.renderFaceYNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 0)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y + 1, z, 1))) - { - renderer.renderFaceYPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 1)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y, z - 1, 2))) - { - renderer.renderFaceZNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 2)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y, z + 1, 3))) - { - renderer.renderFaceZPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 3)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x - 1, y, z, 4))) - { - renderer.renderFaceXNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 4)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x + 1, y, z, 5))) - { - renderer.renderFaceXPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 5)); - flag = true; - } - - return flag; - } - - flag = renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBoundsFromBlock(block); - - return flag; - - } - - @Override - public int getRenderId() - { - return ClientProxy.PLASTIC_RENDER_ID; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) - { - return true; - } -} diff --git a/legacy/mekanism.client.render.block/RenderBlocksCTM.java b/legacy/mekanism.client.render.block/RenderBlocksCTM.java deleted file mode 100644 index 871ff161e..000000000 --- a/legacy/mekanism.client.render.block/RenderBlocksCTM.java +++ /dev/null @@ -1,382 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.client.render.CTM; -import mekanism.common.CTMData; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; - -/** - * CTM RenderBlocks adapted from Chisel - * Code licensed under GPLv2 - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class RenderBlocksCTM extends RenderBlocks -{ - RenderBlocksCTM() - { - super(); - - resetVertices(); - } - - Tessellator tessellator; - double[] X = new double[26]; - double[] Y = new double[26]; - double[] Z = new double[26]; - double[] U = new double[26]; - double[] V = new double[26]; - int[] L = new int[26]; - float[] R = new float[26]; - float[] G = new float[26]; - float[] B = new float[26]; - CTMData dataCTM; - RenderBlocks rendererOld; - - int bx, by, bz; - - @Override - public boolean renderStandardBlock(Block block, int x, int y, int z) - { - bx = x; - by = y; - bz = z; - - tessellator = Tessellator.instance; - tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); - - tessellator.addTranslation(x, y, z); - - boolean res = super.renderStandardBlock(block, x, y, z); - - tessellator.addTranslation(-x, -y, -z); - - return res; - } - - void setupSides(int a, int b, int c, int d, int xa, int xb, int xc, int xd, int e) - { - L[a] = brightnessBottomLeft; - L[b] = brightnessBottomRight; - L[c] = brightnessTopRight; - L[d] = brightnessTopLeft; - L[e] = (brightnessBottomLeft + brightnessTopLeft + brightnessTopRight + brightnessBottomRight) / 4; - L[xa] = (L[a] + L[b]) / 2; - L[xb] = (L[b] + L[c]) / 2; - L[xc] = (L[c] + L[d]) / 2; - L[xd] = (L[d] + L[a]) / 2; - - R[a] = colorRedBottomLeft; - R[b] = colorRedBottomRight; - R[c] = colorRedTopRight; - R[d] = colorRedTopLeft; - R[e] = (colorRedBottomLeft + colorRedTopLeft + colorRedTopRight + colorRedBottomRight) / 4; - R[xa] = (R[a] + R[b]) / 2; - R[xb] = (R[b] + R[c]) / 2; - R[xc] = (R[c] + R[d]) / 2; - R[xd] = (R[d] + R[a]) / 2; - - G[a] = colorGreenBottomLeft; - G[b] = colorGreenBottomRight; - G[c] = colorGreenTopRight; - G[d] = colorGreenTopLeft; - G[e] = (colorGreenBottomLeft + colorGreenTopLeft + colorGreenTopRight + colorGreenBottomRight) / 4; - G[xa] = (G[a] + G[b]) / 2; - G[xb] = (G[b] + G[c]) / 2; - G[xc] = (G[c] + G[d]) / 2; - G[xd] = (G[d] + G[a]) / 2; - - B[a] = colorBlueBottomLeft; - B[b] = colorBlueBottomRight; - B[c] = colorBlueTopRight; - B[d] = colorBlueTopLeft; - B[e] = (colorBlueBottomLeft + colorBlueTopLeft + colorBlueTopRight + colorBlueBottomRight) / 4; - B[xa] = (B[a] + B[b]) / 2; - B[xb] = (B[b] + B[c]) / 2; - B[xc] = (B[c] + B[d]) / 2; - B[xd] = (B[d] + B[a]) / 2; - } - - void side(int a, int b, int c, int d, int iconIndex, boolean flip, int side) - { - IIcon icon = iconIndex >= 16 ? dataCTM.getSmallSubmap(side).icons[iconIndex - 16] : dataCTM.getSubmap(side).icons[iconIndex]; - - double u0 = icon.getMaxU(); - double u1 = icon.getMinU(); - double v0 = icon.getMaxV(); - double v1 = icon.getMinV(); - - U[a] = flip ? u1 : u1; - U[b] = flip ? u0 : u1; - U[c] = flip ? u0 : u0; - U[d] = flip ? u1 : u0; - - V[a] = flip ? v1 : v1; - V[b] = flip ? v1 : v0; - V[c] = flip ? v0 : v0; - V[d] = flip ? v0 : v1; - - vert(a); - vert(b); - vert(c); - vert(d); - } - - void vert(int index) - { - if(enableAO) - { - tessellator.setColorOpaque_F(R[index], G[index], B[index]); - tessellator.setBrightness(L[index]); - } - - tessellator.addVertexWithUV(X[index], Y[index], Z[index], U[index], V[index]); - } - - @Override - public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(0.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 4, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(1, 0, 4, 5, 14, 19, 17, 23, 9); - side(1, 14, 9, 23, tex[0], false, 4); - side(23, 9, 17, 5, tex[1], false, 4); - side(9, 19, 4, 17, tex[3], false, 4); - side(14, 0, 19, 9, tex[2], false, 4); - } - } - - @Override - public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); - tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 5, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(3, 2, 6, 7, 15, 25, 16, 21, 11); - side(11, 21, 3, 15, tex[3], false, 5); - side(16, 7, 21, 11, tex[2], false, 5); - side(25, 11, 15, 2, tex[1], false, 5); - side(6, 16, 11, 25, tex[0], false, 5); - } - } - - @Override - public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMaxU(), i.getMinV()); - tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 2, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(2, 3, 0, 1, 15, 18, 14, 22, 8); - side(2, 15, 8, 22, tex[0], false, 2); - side(15, 3, 18, 8, tex[2], false, 2); - side(8, 18, 0, 14, tex[3], false, 2); - side(22, 8, 14, 1, tex[1], false, 2); - } - } - - - @Override - public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMinU(), i.getMinV()); - tessellator.addVertexWithUV(0.0, 0.0, 1.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 3, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(4, 7, 6, 5, 20, 16, 24, 17, 10); - side(17, 4, 20, 10, tex[2], false, 3); - side(5, 17, 10, 24, tex[0], false, 3); - side(24, 10, 16, 6, tex[1], false, 3); - side(10, 20, 7, 16, tex[3], false, 3); - } - } - - @Override - public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(0.0, 0.0, 1.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMinV()); - tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMaxU(), i.getMinV()); - tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 0, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(0, 3, 7, 4, 18, 21, 20, 19, 13); - side(13, 21, 7, 20, tex[3], true, 0); - side(19, 13, 20, 4, tex[2], true, 0); - side(0, 18, 13, 19, tex[0], true, 0); - side(18, 3, 21, 13, tex[1], true, 0); - } - } - - @Override - public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(0.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMaxU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 1, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(2, 1, 5, 6, 22, 23, 24, 25, 12); - side(12, 24, 6, 25, tex[3], false, 1); - side(22, 12, 25, 2, tex[1], false, 1); - side(1, 23, 12, 22, tex[0], false, 1); - side(23, 5, 24, 12, tex[2], false, 1); - } - } - - void resetVertices() - { - X[0] = 0; - Z[0] = 0; - Y[0] = 0; - - X[1] = 0; - Z[1] = 0; - Y[1] = 1; - - X[2] = 1; - Z[2] = 0; - Y[2] = 1; - - X[3] = 1; - Z[3] = 0; - Y[3] = 0; - - X[4] = 0; - Z[4] = 1; - Y[4] = 0; - - X[5] = 0; - Z[5] = 1; - Y[5] = 1; - - X[6] = 1; - Z[6] = 1; - Y[6] = 1; - - X[7] = 1; - Z[7] = 1; - Y[7] = 0; - - X[8] = 0.5; - Z[8] = 0; - Y[8] = 0.5; - - X[9] = 0; - Z[9] = 0.5; - Y[9] = 0.5; - - X[10] = 0.5; - Z[10] = 1; - Y[10] = 0.5; - - X[11] = 1; - Z[11] = 0.5; - Y[11] = 0.5; - - X[12] = 0.5; - Z[12] = 0.5; - Y[12] = 1; - - X[13] = 0.5; - Z[13] = 0.5; - Y[13] = 0; - - X[14] = 0; - Z[14] = 0; - Y[14] = 0.5; - - X[15] = 1; - Z[15] = 0; - Y[15] = 0.5; - - X[16] = 1; - Z[16] = 1; - Y[16] = 0.5; - - X[17] = 0; - Z[17] = 1; - Y[17] = 0.5; - - X[18] = 0.5; - Z[18] = 0; - Y[18] = 0; - - X[19] = 0; - Z[19] = 0.5; - Y[19] = 0; - - X[20] = 0.5; - Z[20] = 1; - Y[20] = 0; - - X[21] = 1; - Z[21] = 0.5; - Y[21] = 0; - - X[22] = 0.5; - Z[22] = 0; - Y[22] = 1; - - X[23] = 0; - Z[23] = 0.5; - Y[23] = 1; - - X[24] = 0.5; - Z[24] = 1; - Y[24] = 1; - - X[25] = 1; - Z[25] = 0.5; - Y[25] = 1; - } -} diff --git a/legacy/mekanism.client.render.block/TextureSubmap.java b/legacy/mekanism.client.render.block/TextureSubmap.java deleted file mode 100644 index 817b7850a..000000000 --- a/legacy/mekanism.client.render.block/TextureSubmap.java +++ /dev/null @@ -1,42 +0,0 @@ -package mekanism.client.render.block; - -import net.minecraft.util.IIcon; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -/** - * Multi-texture class adapted from Chisel - * Code licensed under GPLv2 - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class TextureSubmap -{ - public int width, height; - - public IIcon icon; - - public IIcon icons[]; - - public TextureSubmap(IIcon i, int w, int h) - { - icon = i; - width = w; - height = h; - icons = new IIcon[width * height]; - - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void TexturesStitched(TextureStitchEvent.Post event) - { - for(int x = 0; x < width; x++) - { - for(int y = 0; y < height; y++) - { - icons[y * width + x] = new TextureVirtual(icon, width, height, x, y); - } - } - } -} diff --git a/legacy/mekanism.client.render.block/TextureVirtual.java b/legacy/mekanism.client.render.block/TextureVirtual.java deleted file mode 100644 index 6bc921a6a..000000000 --- a/legacy/mekanism.client.render.block/TextureVirtual.java +++ /dev/null @@ -1,96 +0,0 @@ -package mekanism.client.render.block; - -import net.minecraft.util.IIcon; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -/** - * Texture component class adapted from Chisel - * Code licensed under GPLv2 - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class TextureVirtual implements IIcon -{ - int ox, oy; - float u0, u1, v0, v1; - String name; - IIcon icon; - - TextureVirtual(IIcon parent, int w, int h, int x, int y) - { - icon = parent; - - u0 = icon.getInterpolatedU(16.0 * (x) / w); - u1 = icon.getInterpolatedU(16.0 * (x + 1) / w); - v0 = icon.getInterpolatedV(16.0 * (y) / h); - v1 = icon.getInterpolatedV(16.0 * (y + 1) / h); - - name = icon.getIconName() + "|" + x + "." + y; - - ox = icon.getIconWidth(); - oy = icon.getIconHeight(); - } - - @Override - @SideOnly(Side.CLIENT) - public float getMinU() - { - return u0; - } - - @Override - @SideOnly(Side.CLIENT) - public float getMaxU() - { - return u1; - } - - @Override - @SideOnly(Side.CLIENT) - public float getInterpolatedU(double d0) - { - return (float) (u0 + (u1 - u0) * d0 / 16.0); - } - - @Override - @SideOnly(Side.CLIENT) - public float getMinV() - { - return v0; - } - - @Override - @SideOnly(Side.CLIENT) - public float getMaxV() - { - return v1; - } - - @Override - @SideOnly(Side.CLIENT) - public float getInterpolatedV(double d0) - { - return (float) (v0 + (v1 - v0) * d0 / 16.0); - } - - @Override - @SideOnly(Side.CLIENT) - public String getIconName() - { - return name; - } - - @Override - @SideOnly(Side.CLIENT) - public int getIconWidth() - { - return ox; - } - - @Override - @SideOnly(Side.CLIENT) - public int getIconHeight() - { - return oy; - } -} diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java index c88d2c81e..4d1ddcfce 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java @@ -11,7 +11,6 @@ import mekanism.common.recipe.machines.PressurizedRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class PRCRecipeWrapper extends BlankRecipeWrapper @@ -30,21 +29,21 @@ public class PRCRecipeWrapper extends BlankRecipeWrapper @Override public List getInputs() { - return new ArrayList(); + return Arrays.asList(recipe.getInput().getSolid()); } @Nonnull @Override public List getFluidInputs() { - return Arrays.asList(new FluidStack(FluidRegistry.WATER, 1000)); + return Arrays.asList(recipe.getInput().getFluid()); } @Nonnull @Override public List getOutputs() { - return new ArrayList(); + return Arrays.asList(recipe.getOutput().getItemOutput()); } @Nullable @@ -53,13 +52,13 @@ public class PRCRecipeWrapper extends BlankRecipeWrapper { List currenttip = new ArrayList(); - if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) + if(mouseX >= 29-3 && mouseX <= 45-3 && mouseY >= 11-12 && mouseY <= 69-12) { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).gasStack)); + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().getGas())); } - else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-12 && mouseY <= 72-12) + else if(mouseX >= 141-3 && mouseX <= 157-3 && mouseY >= 41-12 && mouseY <= 69-12) { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).fluidStack)); + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().getGasOutput())); } return currenttip; From 2f7f38f32757133d4ace28f0a9ec3e7a2c3e52c8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 20 May 2016 11:44:30 -0400 Subject: [PATCH 13/15] A bit more work. Gotta pause to release v9 for 1.7.10 :) --- .../java/mekanism/client/jei/MekanismJEI.java | 58 +++++++++++++ .../ElectrolyticSeparatorRecipeHandler.java | 39 ++++++++- .../jei/machine/other/PRCRecipeHandler.java | 39 ++++++++- .../RotaryCondensentratorRecipeHandler.java | 39 ++++++++- .../RotaryCondensentratorRecipeWrapper.java | 84 ++++++++++++++++++- .../other/SolarNeutronRecipeHandler.java | 39 ++++++++- .../ThermalEvaporationRecipeHandler.java | 39 ++++++++- 7 files changed, 331 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 785169c58..5313ad4fc 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -3,6 +3,8 @@ package mekanism.client.jei; import java.util.ArrayList; import java.util.List; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.client.gui.GuiChemicalInfuser; @@ -62,9 +64,24 @@ import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeWrapper; import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeCategory; import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeHandler; import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeWrapper; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeCategory; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeHandler; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeWrapper; import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeCategory; import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeHandler; import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeWrapper; +import mekanism.client.jei.machine.other.PRCRecipeCategory; +import mekanism.client.jei.machine.other.PRCRecipeHandler; +import mekanism.client.jei.machine.other.PRCRecipeWrapper; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeCategory; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeHandler; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeWrapper; +import mekanism.client.jei.machine.other.SolarNeutronRecipeCategory; +import mekanism.client.jei.machine.other.SolarNeutronRecipeHandler; +import mekanism.client.jei.machine.other.SolarNeutronRecipeWrapper; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeCategory; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeHandler; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeWrapper; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler.Recipe; @@ -77,6 +94,10 @@ import mekanism.common.recipe.machines.DissolutionRecipe; import mekanism.common.recipe.machines.MachineRecipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.recipe.machines.PressurizedRecipe; +import mekanism.common.recipe.machines.SeparatorRecipe; +import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; import mekanism.common.recipe.machines.WasherRecipe; import mekanism.common.util.ItemDataUtils; import mezz.jei.api.IItemRegistry; @@ -156,6 +177,26 @@ public class MekanismJEI implements IModPlugin registry.addRecipeCategories(chemicalWasherCategory); registry.addRecipeHandlers(new ChemicalWasherRecipeHandler(chemicalWasherCategory)); addRecipes(registry, Recipe.CHEMICAL_WASHER, chemicalWasherCategory, WasherRecipe.class, ChemicalWasherRecipeCategory.class, ChemicalWasherRecipeWrapper.class); + + SolarNeutronRecipeCategory solarNeutronCategory = new SolarNeutronRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(solarNeutronCategory); + registry.addRecipeHandlers(new SolarNeutronRecipeHandler(solarNeutronCategory)); + addRecipes(registry, Recipe.SOLAR_NEUTRON_ACTIVATOR, solarNeutronCategory, SolarNeutronRecipe.class, SolarNeutronRecipeCategory.class, SolarNeutronRecipeWrapper.class); + + ElectrolyticSeparatorRecipeCategory electrolyticSeparatorCategory = new ElectrolyticSeparatorRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(electrolyticSeparatorCategory); + registry.addRecipeHandlers(new ElectrolyticSeparatorRecipeHandler(electrolyticSeparatorCategory)); + addRecipes(registry, Recipe.ELECTROLYTIC_SEPARATOR, electrolyticSeparatorCategory, SeparatorRecipe.class, ElectrolyticSeparatorRecipeCategory.class, ElectrolyticSeparatorRecipeWrapper.class); + + ThermalEvaporationRecipeCategory thermalEvaporationCategory = new ThermalEvaporationRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(thermalEvaporationCategory); + registry.addRecipeHandlers(new ThermalEvaporationRecipeHandler(thermalEvaporationCategory)); + addRecipes(registry, Recipe.THERMAL_EVAPORATION_PLANT, thermalEvaporationCategory, ThermalEvaporationRecipe.class, ThermalEvaporationRecipeCategory.class, ThermalEvaporationRecipeWrapper.class); + + PRCRecipeCategory prcCategory = new PRCRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(prcCategory); + registry.addRecipeHandlers(new PRCRecipeHandler(prcCategory)); + addRecipes(registry, Recipe.PRESSURIZED_REACTION_CHAMBER, prcCategory, PressurizedRecipe.class, PRCRecipeCategory.class, PRCRecipeWrapper.class); } catch(Exception e) { e.printStackTrace(); } @@ -179,6 +220,23 @@ public class MekanismJEI implements IModPlugin registry.addRecipeClickArea(GuiThermalEvaporationController.class, 49, 20, 78, 38, "mekanism.thermal_evaporation_plant"); registry.addRecipeClickArea(GuiPRC.class, 75, 37, 36, 10, "mekanism.pressurized_reaction_chamber"); registry.addRecipeClickArea(GuiRotaryCondensentrator.class, 64, 39, 48, 8, "mekanism.rotary_condensentrator"); + + List condensentratorRecipes = new ArrayList(); + + RotaryCondensentratorRecipeCategory rotaryCondensentratorCategory = new RotaryCondensentratorRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(rotaryCondensentratorCategory); + registry.addRecipeHandlers(new RotaryCondensentratorRecipeHandler(rotaryCondensentratorCategory)); + + for(Gas gas : GasRegistry.getRegisteredGasses()) + { + if(gas.hasFluid()) + { + condensentratorRecipes.add(new RotaryCondensentratorRecipeWrapper(gas.getFluid(), gas, true, rotaryCondensentratorCategory)); + condensentratorRecipes.add(new RotaryCondensentratorRecipeWrapper(gas.getFluid(), gas, false, rotaryCondensentratorCategory)); + } + } + + registry.addRecipes(condensentratorRecipes); } private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java index 70f2a856d..83c2096c9 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class ElectrolyticSeparatorRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ElectrolyticSeparatorRecipeHandler implements IRecipeHandler +{ + private final ElectrolyticSeparatorRecipeCategory category; + + public ElectrolyticSeparatorRecipeHandler(ElectrolyticSeparatorRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ElectrolyticSeparatorRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java index 2ee616dfa..947f1b7b4 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class PRCRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class PRCRecipeHandler implements IRecipeHandler +{ + private final PRCRecipeCategory category; + + public PRCRecipeHandler(PRCRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return PRCRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull PRCRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull PRCRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java index 7b0a91bd2..45d9f3dc8 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class RotaryCondensentratorRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class RotaryCondensentratorRecipeHandler implements IRecipeHandler +{ + private final RotaryCondensentratorRecipeCategory category; + + public RotaryCondensentratorRecipeHandler(RotaryCondensentratorRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return RotaryCondensentratorRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RotaryCondensentratorRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull RotaryCondensentratorRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java index 646d0f306..cdfbd9b94 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -1,5 +1,87 @@ package mekanism.client.jei.machine.other; -public class RotaryCondensentratorRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.api.gas.Gas; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +public class RotaryCondensentratorRecipeWrapper extends BlankRecipeWrapper +{ + public Fluid fluidType; + public Gas gasType; + + public boolean condensentrating = true; + + public RotaryCondensentratorRecipeCategory category; + + public RotaryCondensentratorRecipeWrapper(Fluid fluid, Gas gas, boolean b, RotaryCondensentratorRecipeCategory c) + { + fluidType = fluid; + gasType = gas; + + condensentrating = b; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidInputs() + { + if(condensentrating) + { + return new ArrayList(); + } + else { + return Arrays.asList(new FluidStack(fluidType, 1000)); + } + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidOutputs() + { + if(condensentrating) + { + return Arrays.asList(new FluidStack(fluidType, 1000)); + } + else { + return new ArrayList(); + } + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(gasType.getLocalizedName()); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java index d065f8db9..bf366253a 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class SolarNeutronRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class SolarNeutronRecipeHandler implements IRecipeHandler +{ + private final SolarNeutronRecipeCategory category; + + public SolarNeutronRecipeHandler(SolarNeutronRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return SolarNeutronRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull SolarNeutronRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull SolarNeutronRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java index 3d0cd7afd..9d1762bba 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class ThermalEvaporationRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ThermalEvaporationRecipeHandler implements IRecipeHandler +{ + private final ThermalEvaporationRecipeCategory category; + + public ThermalEvaporationRecipeHandler(ThermalEvaporationRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ThermalEvaporationRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ThermalEvaporationRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ThermalEvaporationRecipeWrapper recipe) + { + return recipe.category == category; + } } From 7f068231d0089e56e4723fbbf9b026be248b4888 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Fri, 20 May 2016 18:36:46 +0200 Subject: [PATCH 14/15] Update de_DE.lang --- src/main/resources/assets/mekanism/lang/de_DE.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/mekanism/lang/de_DE.lang b/src/main/resources/assets/mekanism/lang/de_DE.lang index e5b1f4fb4..de5fd7633 100644 --- a/src/main/resources/assets/mekanism/lang/de_DE.lang +++ b/src/main/resources/assets/mekanism/lang/de_DE.lang @@ -232,7 +232,7 @@ item.steelDust.name=Stahlstaub item.copperDust.name=Kupferstaub item.tinDust.name=Zinnstaub item.silverDust.name=Silberstaub -//empty +item.leadDust.name=Bleistaub item.sulfurDust.name=Schwefelstaub item.lithiumDust.name=Lithiumstaub From 1e461abc3c9dd4494e8bf2c2406233d0fca116d9 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 20 May 2016 13:46:52 -0400 Subject: [PATCH 15/15] JEI integration is done! --- .../ChemicalWasherRecipeCategory.java | 16 +- .../ElectrolyticSeparatorRecipeCategory.java | 133 ++++++++++++++++- .../ElectrolyticSeparatorRecipeWrapper.java | 5 +- .../jei/machine/other/PRCRecipeCategory.java | 139 +++++++++++++++++- .../RotaryCondensentratorRecipeCategory.java | 75 +++++++++- .../RotaryCondensentratorRecipeWrapper.java | 10 ++ .../other/SolarNeutronRecipeCategory.java | 66 ++++++++- .../other/SolarNeutronRecipeWrapper.java | 4 +- .../ThermalEvaporationRecipeCategory.java | 80 +++++++++- .../mekanism/gui/GuiElectrolyticSeparator.png | Bin 17055 -> 2459 bytes .../gui/nei/GuiRotaryCondensentrator.png | Bin 20537 -> 9813 bytes 11 files changed, 515 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java index 2780eb9d7..c7e895a9f 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -1,5 +1,7 @@ package mekanism.client.jei.machine.chemical; +import java.util.List; + import mekanism.client.jei.BaseRecipeCategory; import mekanism.common.recipe.machines.WasherRecipe; import mezz.jei.api.IGuiHelper; @@ -7,9 +9,11 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; public class ChemicalWasherRecipeCategory extends BaseRecipeCategory { @@ -43,9 +47,7 @@ public class ChemicalWasherRecipeCategory extends BaseRecipeCategory super.drawExtras(minecraft); drawTexturedRect(61-xOffset, 39-yOffset, 176, 63, 55, 8); - - //displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, new FluidStack(FluidRegistry.WATER, 1), null); - + if(tempRecipe.getInput().ingredient != null) { displayGauge(58, 27-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().ingredient); @@ -75,5 +77,13 @@ public class ChemicalWasherRecipeCategory extends BaseRecipeCategory fluidStacks.init(0, true, 6-xOffset, 5-yOffset, 16, 58, 1000, false, fluidOverlay); fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java index 2823fec6f..a05358924 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java @@ -1,5 +1,136 @@ package mekanism.client.jei.machine.other; -public class ElectrolyticSeparatorRecipeCategory { +import java.util.List; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.SeparatorRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class ElectrolyticSeparatorRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public GuiGasGauge leftGas; + public GuiGasGauge rightGas; + + public SeparatorRecipe tempRecipe; + + public ITickTimer timer; + + public ElectrolyticSeparatorRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/GuiElectrolyticSeparator.png", "electrolytic_separator", "tile.MachineBlock2.ElectrolyticSeparator.name", ProgressBar.BI); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 4; + yOffset = 9; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 167, 62); + fluidOverlay = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); + } + + @Override + public void addGuiElements() + { + guiElements.add(GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10)); + guiElements.add(leftGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 18)); + guiElements.add(rightGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 51)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 34).with(SlotOverlay.POWER)); + + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return 1; + } + }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 78, 29)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.getOutput().leftGas != null) + { + leftGas.setDummyType(tempRecipe.getOutput().leftGas.getGas()); + leftGas.renderScale(0, 0, -xOffset, -yOffset); + } + + if(tempRecipe.getOutput().rightGas != null) + { + rightGas.setDummyType(tempRecipe.getOutput().rightGas.getGas()); + rightGas.renderScale(0, 0, -xOffset, -yOffset); + } + + changeTexture(guiLocation); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ElectrolyticSeparatorRecipeWrapper) + { + tempRecipe = ((ElectrolyticSeparatorRecipeWrapper)recipeWrapper).recipe; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 2, 2, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java index aeed16c3b..6b7a3fe3c 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -10,7 +10,6 @@ import javax.annotation.Nullable; import mekanism.common.recipe.machines.SeparatorRecipe; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class ElectrolyticSeparatorRecipeWrapper extends BlankRecipeWrapper @@ -52,11 +51,11 @@ public class ElectrolyticSeparatorRecipeWrapper extends BlankRecipeWrapper { List currenttip = new ArrayList(); - if(mouseX >= 59-5 && mouseX <= 75-5 && mouseY >= 19-9 && mouseY <= 47-9) + if(mouseX >= 59-4 && mouseX <= 75-4 && mouseY >= 19-9 && mouseY <= 47-9) { currenttip.add(recipe.getOutput().leftGas.getGas().getLocalizedName()); } - else if(mouseX >= 101-5 && mouseX <= 117-5 && mouseY >= 19-9 && mouseY <= 47-9) + else if(mouseX >= 101-4 && mouseX <= 117-4 && mouseY >= 19-9 && mouseY <= 47-9) { currenttip.add(recipe.getOutput().rightGas.getGas().getLocalizedName()); } diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java index 86c070caf..d41b2f99a 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java @@ -1,5 +1,142 @@ package mekanism.client.jei.machine.other; -public class PRCRecipeCategory { +import java.util.List; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.PressurizedRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class PRCRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public GuiGasGauge gasInput; + public GuiGasGauge gasOutput; + + public PressurizedRecipe tempRecipe; + + public ITickTimer timer; + + public PRCRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiPRC.png", "pressurized_reaction_chamber", "tile.MachineBlock2.PressurizedReactionChamber.short.name", ProgressBar.MEDIUM); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 11; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 68); + fluidOverlay = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); + } + + @Override + public void addGuiElements() + { + guiElements.add(new GuiSlot(SlotType.INPUT, this, guiLocation, 53, 34)); + guiElements.add(new GuiSlot(SlotType.POWER, this, guiLocation, 140, 18).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT, this, guiLocation, 115, 34)); + + guiElements.add(GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD_YELLOW, this, guiLocation, 5, 10)); + guiElements.add(gasInput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD_RED, this, guiLocation, 28, 10)); + guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.SMALL_BLUE, this, guiLocation, 140, 40)); + + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, guiLocation, 164, 15)); + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return (float)timer.getValue() / 20F; + } + }, progressBar, this, guiLocation, 75, 37)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.getInput().getGas() != null) + { + gasInput.setDummyType(tempRecipe.getInput().getGas().getGas()); + gasInput.renderScale(0, 0, -xOffset, -yOffset); + } + + if(tempRecipe.getOutput().getGasOutput() != null) + { + gasOutput.setDummyType(tempRecipe.getOutput().getGasOutput().getGas()); + gasOutput.renderScale(0, 0, -xOffset, -yOffset); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof PRCRecipeWrapper) + { + tempRecipe = ((PRCRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 53-xOffset, 34-yOffset); + itemStacks.init(1, false, 115-xOffset, 34-yOffset); + + itemStacks.set(0, recipeWrapper.getInputs()); + itemStacks.set(1, recipeWrapper.getOutputs()); + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 3, 0, 16, 58, tempRecipe.getInput().getFluid().amount, false, fluidOverlay); + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java index 180c56f51..bfb7f318d 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java @@ -1,5 +1,78 @@ package mekanism.client.jei.machine.other; -public class RotaryCondensentratorRecipeCategory { +import mekanism.api.gas.GasStack; +import mekanism.client.jei.BaseRecipeCategory; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class RotaryCondensentratorRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public RotaryCondensentratorRecipeWrapper tempRecipe; + + public ITickTimer timer; + + public RotaryCondensentratorRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiRotaryCondensentrator.png", "rotary_condensentrator", "nei.rotaryCondensentrator", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 71); + fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 40, 16, 59); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.condensentrating) + { + drawTexturedRect(64-xOffset, 39-yOffset, 176, 123, 48, 8); + } + else { + drawTexturedRect(64-xOffset, 39-yOffset, 176, 115, 48, 8); + } + + if(tempRecipe.gasType != null) + { + displayGauge(58, 26-xOffset, 14-yOffset, 176, 40, 58, null, new GasStack(tempRecipe.gasType, 1)); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof RotaryCondensentratorRecipeWrapper) + { + tempRecipe = (RotaryCondensentratorRecipeWrapper)recipeWrapper; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, !tempRecipe.condensentrating, 134-xOffset, 14-yOffset, 16, 58, 1000, false, fluidOverlay); + fluidStacks.set(0, tempRecipe.condensentrating ? recipeWrapper.getFluidOutputs() : recipeWrapper.getFluidInputs()); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java index cdfbd9b94..703de3bdb 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -8,7 +8,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import mekanism.api.gas.Gas; +import mekanism.common.util.LangUtils; import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -71,6 +74,13 @@ public class RotaryCondensentratorRecipeWrapper extends BlankRecipeWrapper } } + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) + { + FontRenderer fontRendererObj = minecraft.fontRendererObj; + fontRendererObj.drawString(condensentrating ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-3, 74-12, 0x404040, false); + } + @Nullable @Override public List getTooltipStrings(int mouseX, int mouseY) diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java index 1d6387b7d..23d5e0d95 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java @@ -1,5 +1,69 @@ package mekanism.client.jei.machine.other; -public class SolarNeutronRecipeCategory { +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class SolarNeutronRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public SolarNeutronRecipe tempRecipe; + + public ITickTimer timer; + + public SolarNeutronRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiSolarNeutronActivator.png", "solar_neutron_activator", "tile.MachineBlock3.SolarNeutronActivator.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 70); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(64-xOffset, 39-yOffset, 176, 58, 55, 8); + + if(tempRecipe.getInput().ingredient != null) + { + displayGauge(58, 26-xOffset, 14-yOffset, 176, 0, 58, null, tempRecipe.getInput().ingredient); + } + + if(tempRecipe.getOutput().output != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 0, 58, null, tempRecipe.getOutput().output); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof SolarNeutronRecipeWrapper) + { + tempRecipe = ((SolarNeutronRecipeWrapper)recipeWrapper).recipe; + } + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java index 3a4ad835f..068bfa2d0 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -43,11 +43,11 @@ public class SolarNeutronRecipeWrapper extends BlankRecipeWrapper { List currenttip = new ArrayList(); - if(mouseX >= 26-5 && mouseX <= 42-5 && mouseY >= 14-12 && mouseY <= 72-12) + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) { currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); } - else if(mouseX >= 134-5 && mouseX <= 150-5 && mouseY >= 14-12 && mouseY <= 72-12) + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-12 && mouseY <= 72-12) { currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); } diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java index b20fbc22f..a191ffbf7 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java @@ -1,5 +1,83 @@ package mekanism.client.jei.machine.other; -public class ThermalEvaporationRecipeCategory { +import java.util.List; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class ThermalEvaporationRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public ThermalEvaporationRecipe tempRecipe; + + public ITickTimer timer; + + public ThermalEvaporationRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiThermalEvaporationController.png", "thermal_evaporation_plant", "gui.thermalEvaporationController.short", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 62); + fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 0, 16, 59); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(49-xOffset, 64-yOffset, 176, 59, 78, 8); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ThermalEvaporationRecipeWrapper) + { + tempRecipe = ((ThermalEvaporationRecipeWrapper)recipeWrapper).recipe; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 7-xOffset, 14-yOffset, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); + fluidStacks.init(1, false, 153-xOffset, 14-yOffset, 16, 58, tempRecipe.getOutput().output.amount, false, fluidOverlay); + + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.set(1, recipeWrapper.getFluidOutputs()); + + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } } diff --git a/src/main/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png b/src/main/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png index e40ff5d973c14d425b713800434c1f3d3253dbdb..19970499064348f3b7b921c8c777f3dee5d0585a 100644 GIT binary patch delta 1757 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 literal 20537 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 W3a&RH%h~|^u{2#v&oTD=<$nOaQwOsE