From 141d806d51b48b2fcbc6c171addf4c300bd674e2 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Mon, 26 Oct 2015 18:37:28 +0100 Subject: [PATCH] Slot background images are now painted at runtime --- .../assets/enderio/textures/gui/attractor.png | Bin 2495 -> 1746 bytes .../assets/enderio/textures/gui/enchanter.png | Bin 2259 -> 1764 bytes .../enderio/textures/gui/farmStation.png | Bin 5771 -> 1818 bytes .../enderio/textures/gui/inventorypanel.png | Bin 262950 -> 3643 bytes .../enderio/textures/gui/itemFilter.png | Bin 846 -> 1336 bytes .../assets/enderio/textures/gui/killerJoe.png | Bin 2220 -> 1650 bytes .../enderio/textures/gui/poweredSpawner.png | Bin 2339 -> 1912 bytes .../enderio/textures/gui/sliceAndSplice.png | Bin 1769 -> 1821 bytes .../assets/enderio/textures/gui/soulFuser.png | Bin 2444 -> 1762 bytes .../assets/enderio/textures/gui/tank.png | Bin 66812 -> 1395 bytes .../enderio/textures/gui/vacumChest.png | Bin 2317 -> 1369 bytes .../gui/ExternalConnectionContainer.java | 11 ++ .../conduit/gui/GuiExternalConnection.java | 7 +- .../conduit/gui/item/ItemSettings.java | 2 +- .../machine/enchanter/ContainerEnchanter.java | 10 ++ .../machine/enchanter/GuiEnchanter.java | 2 + .../machine/farm/FarmStationContainer.java | 107 ++++++++++++++++-- .../enderio/machine/farm/Fertilizer.java | 3 + .../enderio/machine/farm/GuiFarmStation.java | 3 + .../farm/farmers/CustomSeedFarmer.java | 2 + .../machine/farm/farmers/FlowerPicker.java | 3 + .../farm/farmers/RubberTreeFarmerIC2.java | 2 + .../machine/farm/farmers/TreeFarmer.java | 6 + .../machine/gui/AbstractMachineContainer.java | 4 + .../machine/invpanel/GuiInventoryPanel.java | 2 + .../invpanel/InventoryPanelContainer.java | 7 ++ .../machine/killera/ContainerKillerJoe.java | 18 +++ .../enderio/machine/killera/GuiKillerJoe.java | 2 + .../obelisk/attractor/ContainerAttractor.java | 19 ++++ .../obelisk/attractor/GuiAttractor.java | 2 + .../slicensplice/ContainerSliceAndSplice.java | 19 ++++ .../slicensplice/GuiSliceAndSplice.java | 7 ++ .../machine/soul/ContainerSoulBinder.java | 12 ++ .../enderio/machine/soul/GuiSoulBinder.java | 2 + .../spawner/ContainerPoweredSpawner.java | 13 +++ .../machine/spawner/GuiPoweredSpawner.java | 2 + .../enderio/machine/tank/ContainerTank.java | 20 ++++ .../enderio/machine/tank/GuiTank.java | 2 + .../machine/vacuum/ContainerVacuumChest.java | 9 ++ .../machine/vacuum/GuiVacuumChest.java | 6 +- 40 files changed, 292 insertions(+), 12 deletions(-) diff --git a/resources/assets/enderio/textures/gui/attractor.png b/resources/assets/enderio/textures/gui/attractor.png index b02257e1ca80b7f1f5d974c05d17f6d755e5c0ce..c99f84501ec73566be131cbc5244f69022dca434 100644 GIT binary patch literal 1746 zcmcJQdo&wX7{G5L5|0wvP914Vb>;M^(TBC(&lVl3sAy>;b-aQI6-^qFwAQJ^7@8H6 zF500=yv6aRTAkXVBvzvdtwy?pmMI~MMSFI3wod=sJ?Eb9e&4;{Qh$e21^|w8cX9M1kIo3}V*^j?A|`UVZqbe`6Q(NM&M~KG8&kKo zAu79>Y3dUYprx+PtTm8p>*km`7au(EU`?&w_q)*sL)6yolc=#YR!Q2V{ao9cZPv># zxv|2d%z*(}A@$7|b7-Hfi80o(jnw?+*LMGw;ilC|nP}#ceULn+dyG@XsS1*7Fz2}V z3e+mLmUsHuvjU>^3T|QfNCz7E8YdQ1ajlOY4S1VZ&P1hjAw3824ac3>tL{=V5o!H~ z)_}f4U?sB!1T(os*R{mN#K+yK$iCN)38nS&9~W0H^>y)5YHMl+$6l4Uh!&@w@Y!^F zNJg1c4yyao7Fxlp>C)t4!P>%58?+w=4*SS>Z8y5JQ{hpd^x|6gQGvK{HP-UdSuQ7dk zLwb~?bs;a88b#;ad=b|j;1od+bMp6AOzj#CNL6>$-@O`KY)rULXT8>6ttv!FKXb?XnG|9%y_ zzKp-uS(a7`F!`=WV$Zw#`jyId*>I-h_N@7lRIc=!`=ht96kCr5xcTd(y2$wx1)^5u z&Awgbm4-oqfh}*7o6h&N;;V~1AlLn`IUIyIw7%5R0^ae?4!{9>K}7}V=IB6c!lAV` zVYU&EEUl{dPeVE_eHLLbP&nC}Yn)C~eR_X8qvwZ&YCG!Ubjrdm+spN@u+p=NT4TRY zv51_-ctF@@F|!y$8Mqgvdr!KJk28on;ei-gp(El}Xhm+KC`>X@wSmbCO_ul@ zi*(6*DYKXgh?Yt6ECvQ@h7k0=VtEANfi!65_K64DtXY7z(bc0u`f86&=a}Z-Lb;pQCB1sEY7DKWC43?a$yY zzf9?*K=L^Wb|PHkQ&BvVjM(%2MaxE-3`tU4X@*l>KGeY+0=g<~lt)HK3zkxw_}e9+ zw=Ed%W|pL~ef&PZRgjsP*)vKYkw}9b;_J<%iLyX+yoW&R<%0C-4m-NIpLJ|K^G*J+ zc19@2Su>rX8(3wygrYKRVRLR{#ajf*Sz4o+)uuzHq*6E>nU=#zf^JX3PYt!bR3LmoS zx6ar1{S?UmLcC*9DQ}n#y`5>r_Z{{u=8=-b(UZ#PEBrENRvr3^;=O0C3k8Cic4}Xe zHPn>Sv3p}L8I8U&^+@mIn{LivW9NhGl&h-&36FJkWiJnEyRk-}4r)ixDj=J|+ax6K zy(^CP#k2~H^wXXv(|I2{s=(hu)b_>%lO*2aXiRXJt73`AK6>%?-QOqv-Js2Kd={W6 z4@XN-E{RJ}zJ>maF8dU`W&M{P4qkJ3II`jFTHJ1rSR@+-l}e@QG*feK)ETg)+Q&-2 n6|q1%mx6tu_!s`4LFB9<&SdL!X4}e+Z)9*k=H*i96nynh(zL%I literal 2495 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 literal 2259 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6kBO{|QKexOvucRoiz9heN-%$_}a;lhQ-jvf2||3A?D zQ7{?;gEj;do<9i&Wt5U2zhGc;9m#+p_&d8QFrqjMJR*x382C1WFyrH*JHP;9kSKAD zC<)F_D=AMbN@XZW%*-p%%S$a$Fwry6GfaB%tp-@WSbDlRhE&A8z5P1smV=1f!w|s? zTagbAEQ`L^PkpKKa}qe za~i(=%DZ)W#il9W{{NcP%6Q@D$MV97rtH_RpDlU%SAWa$z)%J&+s3Mf{c|1e$!Gg7 z_7X|(PdM*XEfuXFmTrA<@9{>hE?YpedJFSFmoW=ga^q6I^h!D6aO`*5COo zKtq=D1aQ7M@igwjJh!8=2htr@FrGJ2soef1S?|BgM4CX2sq8iVcTv{hiIW;#a~f z%<%T#S*DUq`^DaT51xH{_wV7ufA7AzS^r34U?>oJaJ}&D;_bmNb8F|%y|DEA_qi6I zXEVNfezv-{Y;}*_!t56_?HK|@Zr51Ntt$zQZDzdp=if2zfHz%9yQ0=+H7+*aB`Uk} zA;WQ|k4$g6zHXawe%fiT1IhiZT8H5%=l%Nc2L6} zu^qS8b{{{RW47_T-?{_n(g6y2^b4t-};y5tz+iyeAV4PFm^Zj1=O{hepQ;bj$! za~gL4{C`FKsi=dyR#HPv(BF60%^Um~WVamU*>HWO`8Hnm3varF71sZ|_EceS!K#bu zCA_wus~MGe(2J9|54u719m9*&>H?^84e1Pj-COs?Y<}M!&a&Y3w=nhv^|LO1mAVb8 zD!~9KCHvU+?gW?306-K+2!Jh6nC(#oI~7JX#@)+RRjjVN2!UD9mXA@m)b-mm>gW=^8UZDgZ1fba!#|rFTfW$|CegDAjlUE6=wb$=wGJy{bQ<@iW{L zy?V!P;fh#O^7YbEw6?ZMsAEh>D4|;OJT*9F)Z%$L`zo1qma{oSm$E0Hn_~da2qk>1r<^qo<0g?Rx1eY>nI&{4yY7K%8)iQw-a8} zxMjuGZ)HUmokO4u49utP8+;iIMmUXTD5;j$7TQm66Qiv3?d%9-GI=(+uI`es+U@v) zqtj$7xYmjq>v*^ReAdc(iN=W&^_1IN?z;f|s5y>P-e$a=1ko9sLX+W7nXcAZO;1Q?1qXTKtUBv zbd>0TX;}Y$6>h46nm9?m7+yD`465WGkv)7>fkgUoO;pL;%-c;62)-#x+L8WI{oMy~ z!?LV#hRV@?9LnSY*I%BDFtB4EY{$k)2?5%n@jUIa^V!w(nTbe0iSIhc%OZK9=z+{E8tUa!1dN_xM(EkWPUREK{ubi-Wp{2A zzapK~hE{0+w(ppfaSdsy3TP>74AGzmJ}whecAmXw12+^3=mdh6CD9Eu!T=Sf@9h>qdLkU$W=C@0>N)>#wIohm@OS* z@$j{De`5}X;=a4+p2%YkD|tH+fQe^h2HvwJmed+|F+S!tC)+#C`Uq~cfz7uH1S`L&~0<~3P4rdj^KFR8tz3RL7eY`?}_;zGS`w%R%F$w=~Nwsyl zK`}27gS(5t{?oV?(RC&CxQC?|hki~J-^Wcb%5SZWWe}w{q>Gp~kqA2(mzao~mA4xX z;$&xO=sh9q4k7X~KMXx^$HbusFP1D5+5lDlHeo|6Z&|)NXUSquMHL2N) zdz>3j5yITCp(1aO!;$88NTYnk-Eb$CwQ(ED`LlKk8RntC$oh4tv~UbW)utRf5X^1- z)$^WZN-DnN$i<=I21c#Gr1U^k7_HpIvejE_E4IBlBq~1gKMvogDtuLhM7gBY<|fn!dlS0l zG4e}mbNr6i&iUrCmG_Lrh$P%JjRyEQ@XyG|;2pNGv|7S!Wp^^WLhF~a&+-w9Kj!~m b_@#47>BT=e@$7qepV-}9i7v%X)FZzGIw{%C literal 5771 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 JF6*2UngC@#ps4@= literal 846 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fk|-;1lAy_9RHc+}u1gG&DUu zJtHHdxVX5aq@=vOJil~hMMXtrWo1=WRdscBZEbB`U0r>BeM3V-V`F1?cXwZ3-^`ga zXU&>5d-m)(bLPyQJ9pl^c?%XSSh#TEqD6}qFJ8QP^X4sEwrt(Hb=$UW+qZAuv17;1 zojZ5!+O>Q4?qkP}{r~@e?PJ9Xkh@BP{DK)Ap4~`eU|_2Aba4!+xb^mKZvLeJiH3(t zdCYDL*DYF{Wo@zI!~g#abi3pg)LMFYe#d-2zAU?FUE!~yO`CL1v(;+uUUP7rK5tWh z{r0^toG&ou{JvOFp?E+HXu*Jh|J(<5KRy+GyC}Ee(~7%mb3p-(0`{0WRDRn3Hb1vp zR52Ju2E<8lJ<&Bm6GM1|(vz*0K+y=%GD#M6*$B~XDr^i6_Ka=Q8B?0ysaIceWw@#E z<41JkzA2uQR3PZ(S*zO1%2EeT&fmtsARzGIrE_>p!}6O;vc<#}XvoRS$#w7Hvu1U3 zwdQmSjXln?;`O4r42wOlavot`@p{#&uAe1E@uf$ZPwY+<-~6)ns@Ids1DYGeXZY^s zoN(NR{Rw-6&8tv_`}5g9*}R*ZP$yA$BfatP2V0(2W{cX(kH6KqhyR||U)*0;EPv_x zt)h1qtNB0t%Wwbttb8Mb-9OF)@Bcpgo?Cv9;n?FF437)d3rtw+%n})n{qAF|GjUvg zV4ttnRcmPmT-A6ck(FbN18cG}$t)8h>BwAElQ~92xh8uC!%ccJ@>D3G0LF z((cY<4Z0Bh@Neh?%cV!FL_a64*v(a=8ScCDhX~_?_}{krd5_#)RNenn`0nEUvOoJ7 Yepv7R{3-F04k&0nUHx3vIVCg!0RMtGHvj+t diff --git a/resources/assets/enderio/textures/gui/killerJoe.png b/resources/assets/enderio/textures/gui/killerJoe.png index 059d2ef0f2a81c26db7921d9b59ffb104b50f093..a561f478a092aa3a40f29f1b82260a107c8145a9 100644 GIT binary patch literal 1650 zcmcIkeNfV89DjIGQP8cdAm3=0*JWDT%bK$#*mU`pnP$!*(?zMx5Eh`7Z=l`0a%$#C zZ9}`>AYV`uO)v%BraObB;Y&hlgjD8q-v|Z(R&`4U zM){`bS4fGB_1fnJKusQc@hcMmOksZBUI$OAo(&Laq2YF>kF0&KCsfYCnVUY1{nil? zn(uLBy)*ZLW{neBa*!-pDR$;^BSBQ>|szY4S2KFvhYJ5C_&^;qBy=HR8SRnmpW4{5eTG}ckp(}y&{ zmiq8`vaNo7a_TRNO3T~Bu7_?nzod3HwDXu!?QMuOJNq{FS=kUoK73^{ilg7ZE3<94 z_SyoAuwgTPs9GwOYA6}osWe()PEO9PT9MM3*Hx}B_~Gbe*Ow6_lC5^OM{$CZS`qIi zktTA4doIKeC+$d6Y39mP>!ikUajc0Q8pK^UlqWk4oZV+e0ee#o+Gqj=6d*xmqWc3K z^F)K8x1g|KSFS^pQQv>%J@Em^vh$P5$%|NN%Bcn_&SIdexTUjYScnW<2}Ei^K0(aT z(E%N2QOd=Rm*TZM?JyHTXW(#l@3@uW;rtV|uD&nWy?Q!^)n%sgy{jzTc$C3ljM?b4 z1G^+=5ZKwn`UI)ec-&of zSAx)O=;<-v_(iT4abxk4;^zSBB3BH&0}>W{Wlte9Um*wFdnT1ut*;a?b5e&#M2dJ1W0J$9t zGM>VTZZOb-1W0S}K2#cHkgXcy=6RIjRUIS_KRA54rpSyM^Ezq+SXU%|?RNwHcT^xC zRu@~sbMGO1Q%G*2e8?dX$_#-lxdV3e_O(cno2f_{2$!|uI)fyT9V|or55jMYk!*!R zaWkE$?>s*+KxTD|nY?+iHUHEf(>?dQ362lMcuYt-OerYE9V|tS2^jqzp3ImuChS#V z@a0v$Q{agmh`hVxQOf=Rdsf^H$tC|P8hv!G6@3U9!Z&B-R-r^qO}pokV`KToiOno$FhlPKS!LQyd57jk9Q*dHMZ59?qezTzeB-eJDPJ>bCz?sSIhbrV{?Yz zRL*(G?-e`4y{scv#3jD%pZ75;E-adLDR^|QOeW6_kEG#S|Bcm`cv$8a&u&}VAqGFz^^fEQ+9olk@)p^JD6|Wg7-|%tm zYApP}jp6@)`KG3(?(Xj1-rjlh=B-@0^4PIs|Ns97nl=hXLtqGnz^y~p7eN`NB*-rq zn1DwzUhJyShH1A{L`3xOq!fTxRNNJZS+Tirpk14P^sU-edGa~reULeg0mzq{Ift-UXId*z2niwzqW>F=uHV#*a|ZR=m<$vENizu4$6 zxzVjpkN2lAJiPen#j8~r{iT<;mF{49)V}RT0Lz8N=>aS&lpOZ3y!x--Lk=ys%cZW!y9OJ5YH?|!AakpROR+95gMxOHxAI|dEv$5uGT=<4z zm)@Rlp|QgAnA{ld`*rK@vew+kc4T$^4xU#ZQZ9%|TQOglvt_Zi3d5Gzh<)!~ec<7k zpV7^m${tYqk=-H2uI8EG0^am1=jwriPuV~0`}t(c`B$6RXPoozuL!iprGkidTBh9!n}pwB4g_q9-mU*$^IgUsVARdS`ovJ!V=ay zd$MoUn=?HA`gz%s_p1LtDM@_0&)={w<4u8u%HFzj%t!uy=PaoB`<0X7@W0(G9KZM9 zV($69oaM%sxCgukHvHeU{$F@H!l+H|vl}x1|7FYo(w1*GTQN6m;)yqTJ74C( zzlR@x{{H^_czbp321D+K`A;|PcW+o$qxt-AF^j~1#_c7X2lnhgt*yXyK*cZiOa|7CP>@iru6|W8 znc;4Eq|u)3i+6rmsC|YJh{43Kq{Ri{gP0CQ^3?PTY*bEG1<;B6WhHNK*(jRyWQW-CZe=OX5l3{`V zmm8K-YW{Nw%wxN0GOy$mkDSqZh6^Rq472i>9WLiGWbEQ)@ZHY1;H4RZ$z8UFWw!@j e@~ox9{r_x} zOuj~ruS!T%#wP1t!pLO4CU@$b{<-JebKLu$^Pb=PJnwmazxREg=RMC&oQtg@5`_c+ zDB9a$4+8*^E+GIRCk4+?mY)>h7ww&G;Cv)X(PaAV)}QI!p0Mf`a6PtTYU6kF`7+(If0LOVDsrm+SxFdwWPNo2HtJ`=ZcIz)`VJ`W`DD zu4pgtMWL|P)>(ndv+}Ab`Zn4u-E)hwcV5`pYdqPY0uwwf!|>vR1us)4ruW^!n2ARx zj78J0Qw;?Idd9I8qn;AEOCwYK0&Ag5C225rJdVwew3uvbd>1f^3HSR}x8n1&`+=Dq z?vZ9mAtMrh&dfX#!#3?L9LwK7JI9_J*huOO^(g8(TacajS0Kr&&8NHI(1f*D30LT- z**?p<>fI{{@^Bdm`7qXHW=ePI;=+#5Q&Uw}ZrrEqLUOrmbGe)y6!&~1-#rsOz@!z93GccL-hW^#>nRUd+2458 zx)t}wP`4me;}=M6@3^1TYlm3GZnB#Sc-zxJE=rOg`-v;0U zV(RCDCPag6yT&xGS&<@qckd=&+29Y|TFM?;a8m|vxy8+lC~-pr;G$Lc>w9nHaohuU ztG};SMdld=P%z@k3wF*y}&_f^yQ|CMV$z6R`}<~;^rp!OruyN zV9LTr_&!;)*PT#^RB=QX43vt$sq~MPHa%=*G$zR1MQKL9kuZm zv7C$i@vztgpK-nXW3%H0&)Ir@I`v{6do9^b$qy~oF=vt32P@$t4RKCdTp>h`oT;}yRZG{gFz;j1U<$Hj#IS7FO>T&8&C}_kgKw>CwdAaf752$q&Auxcs5vq*_{c;JL zEDFi1jjYyEdbShtT^al7?|JpHEAt|cYiI&iwVPT%)`06p2vOH#LI(=sk{cKZ@I2l_ zauc9Sn!g)y-b+UQPy@qQ(XL=&qAO;go}N)YSttB8m>pGV{+>y%o-Z<Wql5!_GpBN{$i@pm#$6RUROmzyTr@Kvx6hWI(Bf0od06w1uCGx1`Z%aehyaPl;t5 zbvH7Vf|{4Ah&oE#i&tSkR`nRw<>A zs`hJr&Up0oU^^}RMVX-D?o@~DvY#o%bW?3^4Ge46qv?9a=$ibS^Dbojc+^*(@ zDDfRCor|tZ&Yc3<+^+>C+^-(Z@dgydGo>DG!B9^vU}T3#)PNM9u%e_QC`be(R1@fJ zhBZ?GD^WT9Ea5Whycgc9B*%PkC?`&fvcgy;T@Q+up#fH$er@y%wUMmqssW}04d`Xf zhtJ@j5!aL}YK{f-STnM*j`6RR~c4 literal 2339 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6kAt50nBcr^$ytb;crlw||s`N57=^ff~O?B0+^)<)!6|Wg7-|%t$ zzm4JlfBEk2?uip8PM<#g*s){(|NjRXG73gRU?_$_=(QvpP(~>U@(Tv0bK|T99r9Jx<{AIz-DiQoZPIxY3app-w1K!&r%YdC;Ck8z8$N;yl^+h1Zjpt zsv9<&`%dIKze*GJN0_3YR+z)!V_J@imu*kFWKD)TyJF|Y< zBgSKwuh@i#+clgE{u~p_%5bx@f4<75t;etrA*`}^V)CK>h@b7UZ*WxYdTdv;VC17Lmb23_D{)c zw_Oh|WBAJu@Orn&Kjs7dn(G~(uUe?xS@AfD&%>AC^%kb;+{gCb3WFZfw37HYRZeI-8#v$;J4n&p6_K_mf3Bc zEbS0}E96-BPh9r=eD_3W>tx9VJs?wn&gx~@^?lZ&!6`{d{M?hXoaxC zKjB%dGgx96c#f+d{eFe>!9`M2&C$bVa#wG|W#p00i_>zopr0MS7<%m4rY diff --git a/resources/assets/enderio/textures/gui/sliceAndSplice.png b/resources/assets/enderio/textures/gui/sliceAndSplice.png index 770c359b65c9f8b521583d16b7cec86707aee8b8..7f5df41c6292e3748b97deea05d777ad540d94f3 100644 GIT binary patch literal 1821 zcmcIlX;2eJ6yC&;1QMc%h9d@uRj^hC6~zfs!X-fgDRRjzS7<>2iJ%0M00mkocwi)2 zIaEBNAsiv2Ek>Y-U_~H8ARq)pD3=@s3D9sf=-4{r^hc-Do!NOi-`n@z?Du^$`@NH+ zt*VN)3IIUWj%@7=07P+w03=)yyieW8AG02sl_ zh6F~j>lGl3V&Px`KeF!sT@5ShsnEm#ZeCcXTg#+m<`gH+KnEld-dU|E+fs?*5(o=^D5=p=U)gm23RBo#0Q!R@Gqkl zCh}g-o+&IZO_*-uoTNV*?8=4rHr;> zN|g4zrP?gCYiw#?>hVlz6qV{S6P?7tU@+-Ip|GzcMzZ6I&|QApB>l;a1EqX^i`h^M zu2#^U$g!A^HKLECka=jS(cDwf(7lA=p`mtElZvJ?sCOO|3%7V$#m=+?>GOH7+jU1* zY3hUe&W?Z{{;PpMybk-R>Pl$wv$YYf<^zRDP}XKv6tUir@iQ&P&t#paaCb6q=`|0A zRtNn>CiVH!`TlT72~I_Ky79j=-Jg)-j=9GAP6=SHJvbFMYV%A4ZEhmGx^ zOs=qNOm(VS=~1HleD$-W?$;5%w-%nLgP^f)Y;W67b+TE;h6mz=_{h6VpchTKElYNX zu4BR&F6(8P9BHS(P?({o}cP{6WK8Z9I+LOKtwQuqsR!pWogDUD(y7 zV@`i~k=RIovF8vnyet#Ve8Hs{WM8Cg4+h(AWbyOMZ7`4wrW4glZzBYlsacUg6*H7j zQW^#xm%g#UeeF=C1%6N)uvg%kjD)3N@!@0J?IHEjhsiU^e)K$#iKRukE5j>{0N!Cw z+2A|lxkI-=v-Y@An;|3*5rXkFm{cZ{YtU-t zg6j`tQgHz7-gJ~eekEo~R@v9zbHDaSh7`-VpV3!+uN~Jd3G~Hjfq{w1oXWKPgLty| z0G!m3NYQfGcgYpu9IOhU>R=5UFsonyrVsQ=xIAcK+eD8Xey)NGEx71h$(X>A#_b_` zMi7vw43PGKy)5$&!FuPP1I z$fFzNUmW4mjIhl{-TVnXE6h=q z+zjT4+$>&Ikga>~z|Ic}*B@Mdn?E4gI_QKS3*ir&Ya|WlL8z7mz6zIk`-g-b1?U2| oasz1+wJ2;dLsRj`{6DL0grT>%A$>cFux4d|osFY4&(c5XPgqOYd;kCd literal 1769 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5C#Tjh5(-sS0EP%%+1Y9xmiO) zLlY7bGBPsCiweq13(LyNs!Iy1ON;8uifgNiD=RCjs;X*gYU=Cj=c!6BQYh7ML)4cCXhV=JsnDUo144%Vu@b<+aYr`df?_nwdPj8$Jn~2(o9~&5i=I2bdvozKt};IGrsi{&hz*MdSMghKZo}mb^BJyQjF)AbX(?H= zhg-yzbHdA4z0<`HeqsyYySFD>K4Fu0RTWEz3n@v1o>c(G3=5d;+^zI?QMP5J=cK<0c!&UB)A`|GX7QDE$5DSDv&&32VZ! z`OjA$w{58U^FEfTCH^VT1Kt0V&zCdY{RuHVQfuyYs3 zI=SaR85^cN-v3re!D@x%e&vR%?<;GS*D$R5=xtlKTKwRNtF9N`{Quh-z`9{Z=;Q62 zKux^wj>R+o*=4x7;pwGsHVQ?if?ECmYa7HT&QJSceA*bOC8Q$%|8<7!iL=vwd}B}w zmv8&_{r@+Si1lyl#X7cVH~jtk{=?x3Wo!>#J^pa_@8QdzKVLrlcW&15)eKKw?0oxi zS|GDUj1Z{UWMDWTctF*kc~`C71E~j1Fa5U*D}jZ9L_!V2biet>m=&JaeSX1sq?+NQ zoWmY=f%l9@v>AS``p0-;W$Rz>d2D|^|7@5e^n(9@`Eu?15rR@D1Pi1NG-o%2HvGHG zdd}y>aeMw5bN*=`vlpH-<^G@SR}v22MIRjB*2lQzIfGP#aj?#LhF_ah*ub_nyk{s| zcIYpw#nlk-r&B`w3hR7h3 z7t9Wn`q$>p6Iz-G2rW4Qt)W%Y-Zq zVXxuZ403QBgU@b;0LP!z?7{2|S|4iuxB=6?5((hbw*8(V^FuqrdVYWm_H^}gS?83{ F1OSv1x$gh~ diff --git a/resources/assets/enderio/textures/gui/soulFuser.png b/resources/assets/enderio/textures/gui/soulFuser.png index d6db75cc5bb2629c3b01b15272bd83b81dd62189..fb4c935425a52b02eba45f196bca3fbca03c7620 100644 GIT binary patch literal 1762 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 diff --git a/resources/assets/enderio/textures/gui/tank.png b/resources/assets/enderio/textures/gui/tank.png index 0dab4c8d7151510637de93f558d7758ede663746..1dd5e756413b7a1874a009eb551c7d649383fbae 100644 GIT binary patch literal 1395 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%Z;_2(kexFN<&xDKnm>5@EX_ zu~F5AsLc+B4;i8Da@41u!Xy#WBKys z+tN}PVj}-sN!xtWB3bt2*N^7+?%jJPCtMP>Hmtk7z5VE}$b9kb#r@0j!rSw8>P{4y z?qLbgW@I?X!oVWTAmGE`V1S+TrmBK-hW~Bu1$*bue_zPvaCP4Nd9%~*E2Z4Xe)s=) z3{d;(Ebb3Kepu{qt3I_OMz8ld`!VOAtGF7jN&LNkET<;P=E@l{h9*u14mAda84N!T zy?*`rjE}EQO|J79=X}2W`NQ&0SL}1WrTM3ympm}jD>?@#Zv~QDoxO4Io;`m) z?_DT=T-HeLg)>9V!_`O4z9zl5mV0p+?v9Ai>kMD&UqAbCAv~1vLL7tk+Q_5te=|J$ zVew(3P(Od_YApt@kVA*s-xu*RG{uH6Y>}T_I{i*&AOCSZEry0Vkf;ACJxE`^#lG_R z9hvV;Ukty0T$po}-NCxi|7~`CQqlA+H~eLrErCYu?$AAuE`0OJztbNdPU+@oxc0Ec zZ0G-{KR(QSwVk2e=S?2S&}TdhFZ>yJOpX^bCg_CbGJ4hgDfRr$G^L_OBO2(yPd{D* zmDS#0f<@BmcTx_SUi-xvc5yT`>Xc=raU(~hI3v5&9{vSO`dJTKvK(*_vo+n!+K|8m zi-d?!aYpazKU+Tr>`wcB>)o6C87z*xVXLqHdtJ5n-r0M9W#sbaXkFcitYroRl70-% z-0jT$U-$exFE@W_pVjkgk$TgcUw_!C|C_ProN-GwhD}TMix7KPKzI28y1zG`( z_`0XE^vXh?x4{>;TmLpc-YZ_h612R<>bPtphLbM}ddz+F`UQuH>~&C5!{=mpU_h0< z&FJFKKN?2y~Ws~Y^kOO~M`7Gb8EHK5xeZfaWw7uTLu|j); zmFgACcU)&GN?5~y>h%2lkHga?v5sDM0O-v2moK<{N=sPf`gNgsIAH4i<^Ovg@4D;! zHphH+Z!>qI-8qIb#e(v3^Y0N4au&xi@Lbc`rheaX=drjyi&%gq7fnEe(jWF8hco-$ Sq$<7yS>WmF=d#Wzp$P!S`U7A9 literal 66812 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 SHk6AJr$RhsZBcAa`T5`K#@B-Y diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index 27f4032d..31a70db4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -12,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.common.ContainerEnder; import com.enderio.core.common.util.ItemUtil; @@ -41,6 +43,7 @@ public class ExternalConnectionContainer extends ContainerEnder slotLocations = new ArrayList(); final List filterListeners = new ArrayList(); + final List bgSlots = new ArrayList(); public ExternalConnectionContainer(InventoryPlayer playerInv, IConduitBundle bundle, ForgeDirection dir) { super(playerInv, new InventoryUpgrades(bundle.getConduit(IItemConduit.class), dir)); @@ -55,11 +58,13 @@ public class ExternalConnectionContainer extends ContainerEnder slots) { + slots.addAll(bgSlots); + } + @Override public Point getPlayerInventoryOffset() { return new Point(23, 113); diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index 675243d8..650892b1 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -113,6 +113,7 @@ public class GuiExternalConnection extends GuiContainerBase { public void initGui() { super.initGui(); buttonList.clear(); + ((ExternalConnectionContainer) inventorySlots).createGhostSlots(getGhostSlots()); for (int i = 0; i < tabs.size(); i++) { if(i == activeTab) { tabs.get(i).onGuiInit(guiLeft + 10, guiTop, xSize - 20, ySize - 20); @@ -120,7 +121,6 @@ public class GuiExternalConnection extends GuiContainerBase { tabs.get(i).deactivate(); } } - } @Override @@ -231,4 +231,9 @@ public class GuiExternalConnection extends GuiContainerBase { itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, stack, x, y, ""); } + public void clearGhostSlots() { + getGhostSlots().clear(); + ((ExternalConnectionContainer) inventorySlots).createGhostSlots(getGhostSlots()); + } + } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index a62e3978..2cb42f61 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -428,7 +428,7 @@ public class ItemSettings extends BaseSettingsPanel { filterGui.deactivate(); filterGui = null; } - gui.getGhostSlots().clear(); + gui.clearGhostSlots(); } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java index 96638280..67a0e167 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.enchanter; +import java.util.List; + import net.minecraft.enchantment.EnchantmentData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -7,8 +9,12 @@ import net.minecraft.init.Items; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.common.ContainerEnder; +import crazypants.enderio.EnderIO; + public class ContainerEnchanter extends ContainerEnder { public ContainerEnchanter(EntityPlayer player, InventoryPlayer playerInv, TileEnchanter te) { @@ -101,6 +107,10 @@ public class ContainerEnchanter extends ContainerEnder { }); } + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(Items.writable_book, 27, 35)); + } + public boolean playerHasEnoughLevels(EntityPlayer player) { if(player.capabilities.isCreativeMode) { return true; diff --git a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java index b18d9584..6a950fa0 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java @@ -13,6 +13,7 @@ import com.enderio.core.client.render.RenderUtil; import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.machine.obelisk.attractor.ContainerAttractor; public class GuiEnchanter extends GuiContainerBase { @@ -35,6 +36,7 @@ public class GuiEnchanter extends GuiContainerBase { super.initGui(); recipeButton.onGuiInit(); recipeButton.visible = EnderIO.proxy.isNeiInstalled(); + ((ContainerEnchanter) inventorySlots).createGhostSlots(getGhostSlots()); } @Override diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java index feaf5097..101fe603 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java @@ -1,14 +1,70 @@ package crazypants.enderio.machine.farm; import java.awt.Point; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; + +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; +import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; import crazypants.enderio.machine.gui.AbstractMachineContainer; public class FarmStationContainer extends AbstractMachineContainer { + // TODO: This is a mess. Someone should make some nice, hand-selected lists of + // what to put in here. + + static private final Item[] slotItems1 = { Items.wooden_hoe, Items.stone_hoe, Items.iron_hoe, Items.golden_hoe, Items.diamond_hoe }; + static private final List slotItemsStacks1 = new ArrayList(); + static { + for (Item item : slotItems1) { + slotItemsStacks1.add(new ItemStack(item)); + } + slotItemsStacks1.addAll(Config.farmHoes); + } + static private final Item[] slotItems2 = { Items.wooden_axe, Items.stone_axe, Items.iron_axe, Items.golden_axe, + Items.diamond_axe, DarkSteelItems.itemDarkSteelAxe }; + static private final Item[] slotItems3 = RubberTreeFarmerIC2.treeTap != null ? new Item[] { Items.shears, + DarkSteelItems.itemDarkSteelShears, GameRegistry.findItem("IC2", "itemTreetap") } : new Item[] { Items.shears, + DarkSteelItems.itemDarkSteelShears }; + static public final List slotItemsSeeds = new ArrayList(); + static { + slotItemsSeeds.add(new ItemStack(Items.wheat_seeds)); + slotItemsSeeds.add(new ItemStack(Blocks.carrots)); + slotItemsSeeds.add(new ItemStack(Blocks.potatoes)); + slotItemsSeeds.add(new ItemStack(Blocks.red_mushroom)); + slotItemsSeeds.add(new ItemStack(Blocks.brown_mushroom)); + slotItemsSeeds.add(new ItemStack(Blocks.nether_wart)); + slotItemsSeeds.add(new ItemStack(Blocks.sapling)); + slotItemsSeeds.add(new ItemStack(Items.reeds)); + } + static public final List slotItemsProduce = new ArrayList(); + static { + slotItemsProduce.add(new ItemStack(Blocks.log, 1, 0)); + slotItemsProduce.add(new ItemStack(Blocks.wheat)); + slotItemsProduce.add(new ItemStack(Blocks.leaves, 1, 0)); + slotItemsProduce.add(new ItemStack(Items.apple)); + } + static public final List slotItemsFertilizer = new ArrayList(); + static { + slotItemsFertilizer.add(new ItemStack(Items.dye, 1, 15)); + } + + static private final Random rand = new Random(); + private static final int ROW_TOOLS = 19; private static final int ROW_IO = 44; @@ -22,14 +78,7 @@ public class FarmStationContainer extends AbstractMachineContainer slots) { + clean(slotItemsStacks1); + clean(slotItemsFertilizer); + clean(slotItemsSeeds); + clean(slotItemsProduce); + + slots.add(new GhostBackgroundItemSlot(slotItemsStacks1.get(rand.nextInt(slotItemsStacks1.size())), points[0].x, points[0].y)); + slots.add(new GhostBackgroundItemSlot(slotItems2[rand.nextInt(slotItems2.length)], points[1].x, points[1].y)); + slots.add(new GhostBackgroundItemSlot(slotItems3[rand.nextInt(slotItems3.length)], points[2].x, points[2].y)); + + slots.add(new GhostBackgroundItemSlot(slotItemsFertilizer.get(rand.nextInt(slotItemsFertilizer.size())), points[3].x, + points[3].y)); + slots.add(new GhostBackgroundItemSlot(slotItemsFertilizer.get(rand.nextInt(slotItemsFertilizer.size())), points[4].x, + points[4].y)); + + for (int i = 0; i < 4; i++) { + slots.add(new GhostBackgroundItemSlot(slotItemsSeeds.get(rand.nextInt(slotItemsSeeds.size())), points[5 + i].x, + points[5 + i].y)); + } + + for (int i = 0; i < 6; i++) { + slots.add(new GhostBackgroundItemSlot(slotItemsProduce.get(rand.nextInt(slotItemsProduce.size())), points[9 + i].x, + points[9 + i].y)); + } + } + @Override public Point getPlayerInventoryOffset() { return new Point(8,87); diff --git a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java index ac09a789..2e2025db 100644 --- a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java +++ b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java @@ -102,6 +102,9 @@ public enum Fertilizer { private Fertilizer(ItemStack stack) { this.stack = stack == null || stack.getItem() == null ? null : stack; + if (this.stack != null) { + FarmStationContainer.slotItemsFertilizer.add(this.stack); + } } private static final List validFertilizers = Lists.newArrayList(); diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index 7ff8cf48..3495361a 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -17,6 +17,7 @@ import com.enderio.core.common.vecmath.Vector4f; import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import crazypants.enderio.machine.killera.ContainerKillerJoe; public class GuiFarmStation extends GuiPoweredMachineBase { @@ -39,6 +40,8 @@ public class GuiFarmStation extends GuiPoweredMachineBase { buttonList.add(createLockButton(TileFarmStation.minSupSlot + 1, x + 52, y)); buttonList.add(createLockButton(TileFarmStation.minSupSlot + 2, x, y + 20)); buttonList.add(createLockButton(TileFarmStation.minSupSlot + 3, x + 52, y + 20)); + + ((FarmStationContainer) inventorySlots).createGhostSlots(getGhostSlots()); } private IconButton createLockButton(int slot, int x, int y) { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java index 636bad52..4647807d 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java @@ -13,6 +13,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.FarmStationContainer; import crazypants.enderio.machine.farm.TileFarmStation; public class CustomSeedFarmer implements IFarmerJoe { @@ -39,6 +40,7 @@ public class CustomSeedFarmer implements IFarmerJoe { this.plantedBlockMeta = plantedBlockMeta; this.grownBlockMeta = grownBlockMeta; this.seeds = seeds; + FarmStationContainer.slotItemsSeeds.add(seeds); addTilledBlock(Blocks.farmland); } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java index 0f039b59..ea15c760 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java @@ -5,11 +5,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.FarmStationContainer; import crazypants.enderio.machine.farm.TileFarmStation; public class FlowerPicker implements IFarmerJoe { @@ -23,6 +25,7 @@ public class FlowerPicker implements IFarmerJoe { for (Block block : flowers) { if (block != null) { this.flowers.add(block); + FarmStationContainer.slotItemsProduce.add(new ItemStack(block)); } } return this; diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java b/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java index f5d55ff1..108bddd9 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import com.enderio.core.common.util.BlockCoord; import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.machine.farm.FarmStationContainer; import crazypants.enderio.machine.farm.TileFarmStation; import crazypants.enderio.machine.farm.TileFarmStation.ToolType; @@ -26,6 +27,7 @@ public class RubberTreeFarmerIC2 extends TreeFarmer { item = GameRegistry.findItem("IC2", "itemHarz"); if(item != null) { stickyResin = new ItemStack(item); + FarmStationContainer.slotItemsProduce.add(stickyResin); } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java index db5c6482..6d2423c4 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import scala.actors.threadpool.Arrays; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -18,6 +19,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; import crazypants.enderio.config.Config; +import crazypants.enderio.machine.farm.FarmStationContainer; import crazypants.enderio.machine.farm.TileFarmStation; public class TreeFarmer implements IFarmerJoe { @@ -35,8 +37,12 @@ public class TreeFarmer implements IFarmerJoe { this.sapling = sapling; if(sapling != null) { saplingItem = new ItemStack(sapling); + FarmStationContainer.slotItemsSeeds.add(saplingItem); } woods = wood; + for (Block awood : woods) { + FarmStationContainer.slotItemsProduce.add(new ItemStack(awood)); + } } public TreeFarmer(boolean ignoreMeta, Block sapling, Block... wood) { diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 517b7409..681fb79f 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -59,6 +59,10 @@ public abstract class AbstractMachineContainer return upgradeSlot; } + /** + * ATTN: Do not access any non-static field from this method. Your object has + * not yet been constructed when it is called! + */ protected abstract void addMachineSlots(InventoryPlayer playerInv); @Override diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index e8f06466..41a0c331 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -39,6 +39,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.machine.enchanter.ContainerEnchanter; import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.enderio.machine.invpanel.client.CraftingHelper; import crazypants.enderio.machine.invpanel.client.DatabaseView; @@ -262,6 +263,7 @@ public class GuiInventoryPanel extends GuiMachineBase { btnClear.onGuiInit(); btnSync.onGuiInit(); addScrollbar(scrollbar); + ((InventoryPanelContainer) inventorySlots).createGhostSlots(getGhostSlots()); } @Override diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index 852cffc7..fbd2e25c 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -23,9 +23,12 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.common.util.ItemUtil; import cpw.mods.fml.common.FMLCommonHandler; +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.enderio.machine.invpanel.server.ChangeLog; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; @@ -128,6 +131,10 @@ public class InventoryPanelContainer extends AbstractMachineContainer slots) { + slots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, FILTER_SLOT_X, FILTER_SLOT_Y)); + } + @Override public Point getPlayerInventoryOffset() { return new Point(24+39, 130); diff --git a/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java index 2f3ac575..6201b7a7 100644 --- a/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java @@ -1,12 +1,26 @@ package crazypants.enderio.machine.killera; +import java.util.List; +import java.util.Random; + import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Items; import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; + +import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerKillerJoe extends AbstractMachineContainer { + static private final Item[] slotItems = { Items.wooden_sword, Items.stone_sword, Items.iron_sword, Items.golden_sword, + Items.diamond_sword, DarkSteelItems.itemDarkSteelSword }; + static private final Random rand = new Random(); + public ContainerKillerJoe(InventoryPlayer playerInv, TileKillerJoe te) { super(playerInv, te); } @@ -21,4 +35,8 @@ public class ContainerKillerJoe extends AbstractMachineContainer }); } + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 80, 25)); + } + } diff --git a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java index 8cb87cc8..b3069203 100644 --- a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java @@ -17,6 +17,7 @@ import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiMachineBase; +import crazypants.enderio.machine.invpanel.InventoryPanelContainer; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketGivePlayerXP; @@ -60,6 +61,7 @@ public class GuiKillerJoe extends GuiMachineBase { super.initGui(); xpB.onGuiInit(); xp10B.onGuiInit(); + ((ContainerKillerJoe) inventorySlots).createGhostSlots(getGhostSlots()); } @Override diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java index 7ed4624a..e6b94ab4 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java @@ -1,8 +1,15 @@ package crazypants.enderio.machine.obelisk.attractor; +import java.util.ArrayList; +import java.util.List; + +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerAttractor extends AbstractMachineContainer { @@ -31,4 +38,16 @@ public class ContainerAttractor extends AbstractMachineContainer } } + public void createGhostSlots(List slots) { + int y = 10; + for (int row = 0; row < 3; row++) { + int x = 62; + for (int col = 0; col < 4; col++) { + slots.add(new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, x, y)); + x += 18; + } + y += 18; + } + } + } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index ab1a2183..4eda03fb 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -15,6 +15,7 @@ import com.enderio.core.client.render.RenderUtil; import com.google.common.collect.Lists; import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.gui.ExternalConnectionContainer; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -43,6 +44,7 @@ public class GuiAttractor extends GuiPoweredMachineBase { super.initGui(); showRangeB.onGuiInit(); showRangeB.setSelected(getTileEntity().isShowingRange()); + ((ContainerAttractor) inventorySlots).createGhostSlots(getGhostSlots()); } @Override diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java index 3f83e0af..d282cae1 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java @@ -1,14 +1,28 @@ package crazypants.enderio.machine.slicensplice; import java.awt.Point; +import java.util.List; +import java.util.Random; + +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Items; import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerSliceAndSplice extends AbstractMachineContainer { + static private final Item[] slotItems1 = { Items.wooden_axe, Items.stone_axe, Items.iron_axe, Items.golden_axe, + Items.diamond_axe, DarkSteelItems.itemDarkSteelAxe }; + static private final Item[] slotItems2 = { Items.shears, Items.shears, Items.shears, Items.shears, + DarkSteelItems.itemDarkSteelShears }; + static private final Random rand = new Random(); + public static final Point[] INPUT_SLOTS = new Point[] { new Point(44,40), new Point(62,40), @@ -50,4 +64,9 @@ public class ContainerSliceAndSplice extends AbstractMachineContainer slots) { + slots.add(new GhostBackgroundItemSlot(slotItems1[rand.nextInt(slotItems1.length)], 54, 16)); + slots.add(new GhostBackgroundItemSlot(slotItems2[rand.nextInt(slotItems2.length)], 72, 16)); + } + } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java index 437d5a46..ddf8f999 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java @@ -7,6 +7,7 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.RenderUtil; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import crazypants.enderio.machine.killera.ContainerKillerJoe; public class GuiSliceAndSplice extends GuiPoweredMachineBase { @@ -16,6 +17,12 @@ public class GuiSliceAndSplice extends GuiPoweredMachineBase addProgressTooltip(103, 49, 24, 16); } + @Override + public void initGui() { + super.initGui(); + ((ContainerSliceAndSplice) inventorySlots).createGhostSlots(getGhostSlots()); + } + /** * Draw the background layer for the GuiContainer (everything behind the * items) diff --git a/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java index f98d4a60..b4402e5e 100644 --- a/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java @@ -1,8 +1,15 @@ package crazypants.enderio.machine.soul; +import java.util.List; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; + +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerSoulBinder extends AbstractMachineContainer { @@ -39,4 +46,9 @@ public class ContainerSoulBinder extends AbstractMachineContainer slots) { + slots.add(new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, 38, 34)); + slots.add(new GhostBackgroundItemSlot(EnderIO.itemBrokenSpawner, 59, 34)); + } + } diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index e98505c0..33a5208e 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -11,6 +11,7 @@ import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.SoundUtil; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.machine.enchanter.ContainerEnchanter; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; @@ -36,6 +37,7 @@ public class GuiSoulBinder extends GuiPoweredMachineBase { public void initGui() { super.initGui(); usePlayerXP.onGuiInit(); + ((ContainerSoulBinder) inventorySlots).createGhostSlots(getGhostSlots()); } @Override diff --git a/src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java index 3aa2b4b0..96fa4783 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java @@ -1,8 +1,15 @@ package crazypants.enderio.machine.spawner; +import java.util.List; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; + +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerPoweredSpawner extends AbstractMachineContainer { @@ -30,6 +37,12 @@ public class ContainerPoweredSpawner extends AbstractMachineContainer slots) { + final GhostBackgroundItemSlot ghostBackgroundItemSlot = new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, slotInput); + ghostBackgroundItemSlot.y = 42; + slots.add(ghostBackgroundItemSlot); + } + public void setSlotVisibility(boolean visible) { slotInput.yDisplayPosition = visible ? 42 : -3000; slotOutput.yDisplayPosition = visible ? 42 : -3000; diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index f019e318..12936d28 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -16,6 +16,7 @@ import com.enderio.core.common.Lang; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import crazypants.enderio.machine.killera.ContainerKillerJoe; import crazypants.enderio.network.PacketHandler; public class GuiPoweredSpawner extends GuiPoweredMachineBase { @@ -41,6 +42,7 @@ public class GuiPoweredSpawner extends GuiPoweredMachineBase public void initGui() { super.initGui(); modeB.onGuiInit(); + ((ContainerPoweredSpawner) inventorySlots).createGhostSlots(getGhostSlots()); } @Override diff --git a/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java b/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java index da4e394f..17fa052d 100644 --- a/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java @@ -1,12 +1,25 @@ package crazypants.enderio.machine.tank; +import java.util.List; +import java.util.Random; + +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; + import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Items; import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerTank extends AbstractMachineContainer { + static private final Item[] slotItems = { Items.water_bucket, Items.lava_bucket, EnderIO.itemBucketNutrientDistillation, + EnderIO.itemBucketHootch, EnderIO.itemBucketRocketFuel, EnderIO.itemBucketFireWater }; + static private final Random rand = new Random(); + public ContainerTank(InventoryPlayer playerInv, TileTank te) { super(playerInv, te); } @@ -45,4 +58,11 @@ public class ContainerTank extends AbstractMachineContainer { }); } + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 44, 21)); + slots.add(new GhostBackgroundItemSlot(Items.bucket, 116, 21)); + slots.add(new GhostBackgroundItemSlot(Items.bucket, 44, 52)); + slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 116, 52)); + } + } diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java index 90605cdb..248b837c 100644 --- a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -21,6 +21,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiMachineBase; +import crazypants.enderio.machine.killera.ContainerKillerJoe; import crazypants.enderio.network.PacketHandler; public class GuiTank extends GuiMachineBase { @@ -85,6 +86,7 @@ public class GuiTank extends GuiMachineBase { super.initGui(); voidBut.onGuiInit(); voidBut.setMode(getTileEntity().getVoidMode()); + ((ContainerTank) inventorySlots).createGhostSlots(getGhostSlots()); } @Override diff --git a/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java index 5e9e60fc..733f9171 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java @@ -1,14 +1,19 @@ package crazypants.enderio.machine.vacuum; import java.awt.Point; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.common.ContainerEnder; +import crazypants.enderio.EnderIO; + public class ContainerVacuumChest extends ContainerEnder { private Slot filterSlot; @@ -33,6 +38,10 @@ public class ContainerVacuumChest extends ContainerEnder { addSlotToContainer(filterSlot); } + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, filterSlot)); + } + @Override public Point getPlayerInventoryOffset() { Point p = super.getPlayerInventoryOffset(); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index d18d9025..54f84109 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -25,6 +25,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; +import crazypants.enderio.machine.killera.ContainerKillerJoe; import crazypants.enderio.network.PacketHandler; public class GuiVacuumChest extends GuiContainerBase { @@ -116,6 +117,7 @@ public class GuiVacuumChest extends GuiContainerBase { addToolTip(rangeTooltip); filterChanged(); + ((ContainerVacuumChest) inventorySlots).createGhostSlots(getGhostSlots()); } @Override @@ -180,8 +182,6 @@ public class GuiVacuumChest extends GuiContainerBase { if(te.getItemFilter() != null) { drawTexturedModalRect(sx + FILTER_LEFT, sy + FILTER_TOP, 0, 238, TileVacuumChest.FILTER_SLOTS*18, 18); - - drawGhostSlots(mouseX, mouseY); } int headerColor = 0x404040; @@ -195,6 +195,8 @@ public class GuiVacuumChest extends GuiContainerBase { String str = Integer.toString(te.getRange()); int sw = fr.getStringWidth(str); fr.drawString(str, sx + RANGE_LEFT + RANGE_WIDTH - sw - 5, sy + RANGE_TOP + 5, ColorUtil.getRGB(Color.black)); + + super.drawGuiContainerBackgroundLayer(par1, mouseX, mouseY); } class FilterGhostSlot extends GhostSlot {