From 7efa4bcdbbacc7e1be95f5ca893f1a2e10c0bbc9 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 26 Apr 2016 17:40:17 +0100 Subject: [PATCH] Fixing things --- .../render/tileentity/RenderEnergyCube.java | 19 +++++++++--------- .../common/item/ItemConfigurationCard.java | 2 +- .../mekanism/render/EnergyCubeAdvanced.png | Bin 0 -> 2423 bytes .../mekanism/render/EnergyCubeBasic.png | Bin 0 -> 2428 bytes .../mekanism/render/EnergyCubeCreative.png | Bin 0 -> 2415 bytes .../mekanism/render/EnergyCubeElite.png | Bin 0 -> 2427 bytes .../mekanism/render/EnergyCubeUltimate.png | Bin 0 -> 2424 bytes 7 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/mekanism/render/EnergyCubeAdvanced.png create mode 100644 src/main/resources/assets/mekanism/render/EnergyCubeBasic.png create mode 100644 src/main/resources/assets/mekanism/render/EnergyCubeCreative.png create mode 100644 src/main/resources/assets/mekanism/render/EnergyCubeElite.png create mode 100644 src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index b60de96fd..824e57485 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -15,6 +15,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -45,14 +46,14 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer 0.1) { @@ -111,6 +112,6 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer&=X@GvzLxwK*`3fu(2`or6qo|&`v+UtDZ+TUJl z&7QMAj1g>!{uB)WfF*q^HQY4kn%{*Mrty{^tKBrMk_5#_A_R#N8A}8K6pnxmVdy+o z5)=-xIO)6ZKt2Glz=<0fBZ&zOAtwlUZY(p#P0kaV*Z|<;FBh^BQXmP24JC2;zSyyb zW-Nxw@x^W@h2lenflxAcYlaAl$Y4Y!WTYf`bFlt?7#}&=6o3awSQt4kl`kgCeX+A~ z$tK(E#$hqD5J`$J_MNDh&@fD(Km=h(ZXT`)AP8bSz1={P7m+~v97Di^Bpluw2jX4v zAQ{Ay33$xhgEj3Y;v|y8skFJhOez<8U&W%uPmg6Nr*YZ1a>!J70>RUpNWznd1P~1J@S>3@6av-Lixx-$DM5sJE}buyu=okkJeT_y z*Zps~<`5`j2bAjAX)&Q=TKyq(ME2xQ_-=Jd{~g+$ymh(i+z zc$nGzkhvex;6V){1kgYbk0%n%`Y9mZGtiwt^QIDmKqAotJICdG%WsO%FV{!eey=?Bntuye z#D2VN`HHsJH&(>Fyc)H8?{w~im6l)F%;Yw=Y+yJgE}wz79$CzSAy}mji(fe*EN&Wu zBVJt_`Y8%BZk6^{ovT0T`TU8BDHWhPGyB9ZnyT08>s1SC4|rrFt${5700R)fKQt<> z)3d~K`L7M2ukWZtD)m+<6bvTwgto7bKdDx$LwmH^!OUrc;qFh9QI`t~t^W9JeEib2 zjZ+?aW?bBbH-QsI<4m=H&+kls_3YqSrVxkzuJj&LnX`L0$V4n;%jJ)skBo>dEG$a* z_>Gk+6eZbUdHGJar;J0IH%n@CdcD3a?7M)Lf{tNPwEjd{nQX<16#+9h{2d(hl~dD- zJf*n#LYeh_Ol$w|+YEd9b8O>fGMzV>EV8n)D&Qz>+cVWv)R~=4!INjce0H_5(Ou`E zw|8)`oY-s7@6UgF#{UmQa!})*|6)F=@?U(r26cGb25sMyC&$uqa-ME`m?jdjeWKaT zy1^3@-ZnNi*Y&o)?|d{J9kS$v3NTKfoEys`T$FVWa8}w{#7cX6;%H|lBO)3$pvW5^ zAFs-0RCG_rO~xYE<5QBP@pRagy1J~BP^KN;-Ccq!BYJtQ{H#YaX(->Y9mcvm)$l5( z`>ry#A>c}63e@r0Ekj95`o#5D%8k1AoAwHv3-juJ4Q$JS{M@3VWn~-Bp_IWXOOAdX zcfYrHw4tx3C&jP_Kmr|Mz`<*VQ-(`TO-esw|yPr8d>1%v&K=WioO?#5BnQ3y% zAsYN%4~um^+n?8w99vhzhcfKOMqUo>7-ISbLya@}#@@H>%~@R@ z2MaeMTF(RQmFYZHBcbi#QTcybQ@CAc>&N_KGdS$##?ytUMR#DW&g}K1V;O2EN$tNX zboTA)^Z!PH%eD;fC>S`xJ2?84rYp&RQvOipe^-9U8tLqpH9#zHJbLT`O=}d5X@*@# z1}XOthgPa+KSnoc?R8x@)HRN{{ohHfLvLIk-5jMFE?(0~15%*N&j`;N?J?2w}WM8zvr(TF}dLvT=FOJ*M)Q>>MuR0d;_?%tkGdx6(7bes^*g+X< z2|t{^5C*nHU%-&^H)&w0UFdM}F#`M@ZWtY}j6QVy*5Tzh<^iXF{tz&Vj<1;osNl07 z{!CjxJ%gMjUo5QP?kp`S0Y|gS>XG`IGl);yk*pNUicYOT3M;ipT-{}jsgB3y*M3#} zEuCFe6k0?t3Odp;-1A1=Jk?=DIX!~gk(`Tm-%M9wV41Bs~% U9}yF8cbb2N=s^ssDj+`Ze<$SJQ2+n{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png b/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png new file mode 100644 index 0000000000000000000000000000000000000000..d96c1d6cc296ee6b87108876bf86ec6530162990 GIT binary patch literal 2428 zcmb7G2~-o;8Xlq%j0^fKRBXi|Qc$+cBqWlMK!AYI2gquoh!B$jA|#VH2_~RmKzS{p&iy1b}H4q9C4}=i|)~pkh0|4r8YjOSNnOU^*+Md_goK2R9&*A_&rTRcVQa2<@3~`_3=S%Y6(bV47l%dE&e#b> zLIwvSbLbB4t`L<%hGBP_1KrKl!+}hNSJ+b=+-dL>*GnRk^CbdgiYxk)>++Xeh8u?P z@B=VDUPGS>Wu4{k+pu4_wlV_qX>Yq~??q z_M4WMN&JIDZyu0K+KS3br}eNj^f#R?d(MeFaQEG3RpAT(Q1^Y~fWK)3?5wDyGZ-%) zWF0zG!eB5?zJ9$)ef)UcMzJ{dEh>@Zl&IAWuYMmMKHt*IZEA0C&xu^+>zlLr4vJN_ zwzg(F2Ze=oZGHRn>C=;?mANmr7!KS-X&4zjKUP;)7c;*){m2nBb$c%{J4&>&R8XFtq#;Z?Nu5I*sH?kwL zr1^bbqAPpbyloBE1+S9E{Z*GPvHC_v?lG85xp~NOUT66??WFEr)*Vs;`D$zHewi4n z%*e=KJD*5Aq*Sur|76Lg{H8%mWiD^esdD1kXL$1Vj*gIgmV*QI!!HL99b%YTpXqu& z=%3I$GIF7Zp2GaHq{?JL%{8Nkm1984J6RzzZ1J{^pPdODJ9f;syuAFY>sIWFK!`>& ze%523{k*N^rWKg9#!)@Zjd1$hxyOSxEo#-}%a=Eg<|HL0vF|7ThpX>%kzk-j{yKhk z7gulCwIoQ5G+EX3{xlXhT=`mU*>>Z~R|iSfAs2St)MM}6p?dU)pKe*GuU;8F`$wD5 zTleojyV%*)l`eNu;Z)1MU<-=lPsGP46s4BNeZIL7r1{L%XG@#dU*;qGqi+nxdLDrZN>G~tAA zBQ`5A&GWq@MtIImf8E73q_LK;_1HjAGcF=Bk}^7rw|1?o9zeJS5mJ&ZGyCEnENM93 zwY9A0)W}RmqF6k~`X~U>aGvhpR}?$PbtGy=^*22`r|93c#Q7}hw76tR#mJkoq0yc1 z|C=9K@@n11uDi;4GJ`#uc?8pnky~TWABSOQ&-WF#?2XPqN59@bSb3`J{43}2?t&7L zoM{F|;OEs`iq4`+|4fMw^(Po^wHu`AZ8f-`z|-vUm5Q zOP#zF!i_+dh8m z(l~w3!eWmfR$ppa+}2v1-cV0tnVOsH-+JObS8Oli*7T+x%hunq*l+_;wJ1i`ot~Oh z%Nq!EtTLGo}BG&55DX$`5iMK;d}NV@TwTpK5wFqFP#to}ymc)ccMb@`*g!!G)B z%Z->+YOp`9Y3B6agJT;*LtEMkb#YHfSZr-!rVlLV0>e*En)MNqafg8j3}`VmDkUQB zCVoI>()Hx{%BmSqR8e@*yW!?zDRxckrOCL{v%M|6TL}TOth45~s?OYvDmwfwe0d{t zyDBTZaP^+-nteS$-bQ=@-P=U(0}jJO!PcHl{BLJ|1n{Fj1#H4YK@$M3-o(Nd%0I@( zaT8=-&24+T=Eg>c=LxxGqdf(A(-$@1U83jIG`IA}>gCLc_sQLcaoHE4lNYz4Iw)ynGdtZKX%X-cln;#A&3@xbX T456gy{)fEWeL2Oh;mLmh9O>M5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png b/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png new file mode 100644 index 0000000000000000000000000000000000000000..c90b056715e99f0db31c4a5d5d918142e0f5fed6 GIT binary patch literal 2415 zcmb7GX;f3!8of!3C=VXCk3MjYaR3xD0wIw|kR%KWG6Vu5fskAwLI#r?6QV+@IJ8(n zL9tG#(ejw0XoE#jU=>6`L4{PrC-}t5WB>(3L7)kO^@p!(^{#dA`Odj}@3YVMeLv23 zfdSr@=JU(}0I>A+p$8jBwdtKT)A;>$4Y$rX%!L@?P>6Ulq~J_bI1yR02ZX6g4 za`{PH?||+AfLI}5g+t-~>nS|35W_WLFiN4s$OZs+52b|5O8_BMEEp#cQPF+Z%h4zS zpNeL?_~ZN~USPbyM&)=t*6QF*Yq@ z(WprXlt4v)G!^b2i1HFkL6i%|)rp74<546s2JhlVB)B-D2spe87DvY7aZWfq1&^Z; zaHy#VZQM=D-%JUnGpF`4&Zy{k2$E2+ScO7?Q4ld=X&e?$CX=x^0+v8Z?H#uw2tR+0q727@xOT*@=nWAoB!vN3mmy^#rMbVH$wd2%5rf_&*zv~dN) z7w{aU?Hi0+UQ9GVnyAD|(8{|H9d)xP<@9#Tw0EO~w7J*wahK z4l;$GTGu%F)cl~x*zr);3 zn}-NT)n)&+t}l>>?ft6OU^6;U8vE~^F9NkI(<)-_ zAe205!|L**wuSzqK4n~%-|gIduss}A9^cLeV89Gu4nPC`W+k4;WtH+Oj+`eJNzy4}*@q_+- z^K5P3ZD@P`{9Gs|`_$;@=*G6DrYxs{-+H1WBJSA0cG=FITRbu{Qdn8(SrBL+ZewF3 zDz^=kC=|mu&$G{n=Q+_F&b7VWeSM0WmJ%U!^TLJY2}w!hL90y*#p@#TSPM>#dX1&3 zS1g&C&ED97n9u-bW@f*2b>+!-?0Dr@;#XWY><0zb>bIYd9^oJC=}8!Fd9j1XFL)E|KNr}G`N^4H^XedCePCUFKGJoju z<|EvpyU)s0(WCmz`QZQV)n{ir{kN$DI8*Ia(b@T*hJWdI>oqQW*B!-l_V&JwTD)k{ zEy`jVjJCl144zG8QA@5~ePoj+M=-9WkZ%pCe%1~QkwXSx)<9JrFfR@4xJL?lW)Yb1t=$ zNTg!4Iq>yTHS5Lgo|ir8C%bYyWW6`Xnv=%sZ0ZdpP5l+p1gC8$>1El6p>;JowJqW; z?mliaZYyRX8(Metet4~qj4au9L#~oKy>ZIX5Z3g!XN9~oh@*A>SK4R8X0KA)GC8Yz z`l5JU>&iAh*ZsVO^>jGLfvVt@mz_Ik=5PmAWgolD<(TT?3g~i>=FyXcz8})fW`9Nd zedB@WM}$8ZI1T!^=$(}I>x)5mpYPz-(dC1416$YK4byaOFC7*MAH7p%;9$%4792Vs z+BbMh?$U1;$~&>hD)=xWUb+#Y8uDm*^VYlX>N!GID$~gNTE!MFwFY12A^GXV) zTbc21q;l-sW_v+sZM9E}U%73G7EWJa^)(0iigiVK@laL#!~CosYL`u^l@@+{q1Cy{ zW(A_!esyT|(XgXXb-s66VM7*&by4xuF=hMM*_6?SsDj3R<^A&r@2BRcPn{}q`1a)t z_)vX}POI&jANnD6VYyDX=bOe1g!;fLwMyEWp+I`V0s$gfElBsMyWp2B*4wSun+MB|6)(g6QrwhSbY?ilq1HWBof?xLmT~;o z10BFmTabC=ySA{8xUEQB=qjIkT;}XgfS`oW0dgdcH3?wDCVzau1y4-CC&|qf51cXe z4Gq@~AvxEO9eKGk=G7s&36`4r#%?+6vPg`<^vDS1Af&;Sv)ZY)(h0hklW&%;~?2f-L3(GQH OfqWSObnV)hU4H=Ian<_( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeElite.png b/src/main/resources/assets/mekanism/render/EnergyCubeElite.png new file mode 100644 index 0000000000000000000000000000000000000000..7c993a8e6d16284c29acb3cbe366f076d3b2c014 GIT binary patch literal 2427 zcmb7Gc~leE8lRvd1~nqqLZ3(sNGxy%_yWj7-zi*j) zX79$3patkJ&;S4|UmKL@0J9v0;gPaPE{D#CM6NuOjjKW=LC^r;#Z*Xm{6tWOjRE6?Vg^oMcLRqN z3K+NuDwoKW_=EAn;8ZCXmKqYyPfg_01URNQ)=NQ09Ed;}533L*iD9~eft&J6N7g1a z0f(J3ktH&4A4o-VH)8!EDTt-Iy1Vd6Bofwx=1QV^QpnV`STd1BB@k%@648Z7qLYYp zG7&rd;E>a#f>?SeD{%TOL}K9LWikn!K#;Jb{y1x|U z$slPs1SQQ>Z(}?pgWz~bg7x>GsutEMLMRqMa@g6F-f6a=RG0z^0;P}$JCz^0@Dm)| zSpj6fKoW^aq)<%!eMv+Qe>ZXke~Bd^WC*6>{;AkADx`x< z%a5p^jt6eArkMOxdtV)Ir2n4@E}e8UymJ{5zrcJq>kINm$Q6+T%ubU#1dZu_4x zPR3t*)#jFKtf_$&_1~PYs?QmTIj~om!?^Q{pHn8*Ye$eTlR(ZG+}qU4t=zA!ECn3#cvV+N$M%&az(5Eu zAz}5yW?^!5Cudzr=4_2N%FbpVP*+#CyqR2&wz0FTFKD*4wVmhow0X3*$Rz^h8#l)N zDP#OndIYKomlv*UIzgRZ5;xlLNT)43-5$TRqgN57%sx3n11gnh8+-d<#rLU~Q!C#{ zj-R)zudhEnv}ezr;D%W^fMtbp>n_eMZZHlHr%A7P_q6pFE4?BMANSPsOz#?4O}8fT@QK6Jf<{+WT{L52eBA5M%qGVL zXJCFCRvFFEW<)cdyjA$j&IDSGW=oeYCBL(bjEY)e23Qq==$tHkfiAVZu(9gdjk@mg zk$Kt-K7ZDl#VD*hDmdWaHLwhVNAG-$5IyxFr*86e$QG z9k^EAww?a(hXsnNSBbRZO@^BHoPjfk$6kL{&0Hy1hz+!IxOl5IE!hu`NqDtGtFPo^Tl*_@A>Cqd&$v(Gr|Kcj(!qy?Z&?!RJ4di-uP3tRwH2|AT$NF=)Z-RIYYa z`&b03)R-%=850-TfOU(nymne&>v#9;s!PpF>^E!Vr=lhwZ>dVx<=K@ym1M*}_)6`K zKCM!f2AHX=EqYax3DMCl9>u2A!?5)lN8UofIS=T)7v-R{%C_*CO{B~v{=R8f(78)2 za~#lkQ*h?Az8p1w%bF*@rB-yspIKk``Kd*yNOMQ)u&S)qWj`b>{w?EjYeH#J8sGW8 z=ef*d#La7hn|Qx;13x6pxk%$22RM(=q42Rmi=D;)%0Hn#g1#AEilyc{7tYEq{p{Qu zB53vjp>@bSv&A=IVOTBNVk_d}g^oS`-txoVte}=_o=m2GnLe$pi5XHKTvW5oVoRb; z%Bhrc%bgy?uGY}ZzAU!q5yMr^v6XRjUfAt(*#QeqmORpxUms~2n!CL9?Cpd8MAAj@doItCC%O0=AyPj^hrTL$}{qE)RW}Kl}dSkY@173 q_GFAjB^&*J-<;Ez?Zewlv-to=y^uS=?~oyXLjXGEI&( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png b/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png new file mode 100644 index 0000000000000000000000000000000000000000..917e17d57d01f5f76532b8b6c436a0734353fe20 GIT binary patch literal 2424 zcmbVOdsGuw8XwRsim0g6A{%o;1O=5OlNca@5Fi1KNP>t7MHdKUfHWo(CW9dXY*y=& zBHBf31;nMtvXp>td{Br=MG;gE4*{*f5*3w~pjd$-JKh78XmlX6$>lK5;KOJtWaTW0PyA{t0b{<2qnfq@iHZw)L&*K z5oJ;~Nz4eQ2CKMGf^3}*fi~#`VX-=SEK^G2_z=C5S(pO_gi46Xifu|YE16B2@XNx+ zW;2CEoPeNmHfd5+cyI`j3nLJbL3VeG1woML!6btWPdbgUnn{K2tOJryV{WRzryiUN|U6otaP zuL-mo4Tb)Y@kz8gOsj$@p^zF*LSnIe#4Vd9W3l`5h0H)q4T}fICMh5#%IC33n1w8r zNm)E@0L`7wU{D!!8VClsGwIv_Prm@F2g98Q`Z4{dxqPJ>l_+DOX|C)K?wUX4vbYE& zL182ehPO>;FC+m*VRZtmB67JC*&@1#WlAZmQM;PMJEayvWZNNWAOb6h6Y*imKB2*# z7eMn51VJj5PB-iK1F0U|HMBq`j~)Qh>F%T{uJjXopW@Q~E0=vg}q# z$)m8%&HX{FOWmT!kN*BTw?8MPUv~RSNw>Zye|MC{Ou!cK1po`+e;l~-BHQr($dCXWM^lqe;hHsNt@r7Y0P^jZCgKbbo&63EtkKT0ClKCh^L1x*7phd%^|;*J z+=}k<^71|RtU`dgS-84mMTDOSj~+knO}}}yp`g`>H|f|B&BG%(#lwI#;7|xSq(fbI zJvMgO{7v(oOeUui3}s0=MT(E!QXjZdugkCM=(v|tCCzw>tnca-3ps4I;&v*412V#Z zp$%@NxqY`?FGR6f$x-Zb*;XBp*0Yqzq--IF7@ozX4CcXlCkRz z<}iCGsR`sC7$UnUI49Mg80>`2F44l(FG6qaCfr=2NEwe_hM@ zs`Gf)ow3rYUB|fk)V(3EI$GEE!NSNVQhD>1f)&lA_Ce-KQ(Ak4=~>?R)1uNsjkhB) z4rg0=Tdsb33OrizOObPAP*Gr0+IV&6*Zao?53mSMPFA)*>^s~T{j&UcU3FkaB)r;q z!H4h*4>%$R4~R<{r73K2UfTFBe*2h<$J-(50fT7ipv zV=g=JBZdU@%DU~Y`e&!F*22=h)EB;3Pt@-^n&c*Am*z>o%_`FgSrr&4st1Z&sMHcrnzO@gIID(X~7$g05 zeY0=5$!|^gsPd#ebl%WXf9KnhkhckkhpIa(2ZxSU4|<4{qaHijk%w-XR!J;XV{u1e zVWF3EU5@X`wk3uKO^mdQ2lCFCnwy)?#w{i;vc>9KbED`LI3~& literal 0 HcmV?d00001