From b2d18fbb64d5947fec718e218b0e2c2788b33fdb Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Mon, 15 Apr 2013 02:27:33 -0700 Subject: [PATCH] Moon dial Creative tab --- thaumicbees_res/changelog.txt | 4 ++ thaumicbees_res/lang/thaumicbees/en_US.xml | 4 +- .../thaumicbees/textures/items/moonDial.0.png | Bin 0 -> 1805 bytes .../thaumicbees/textures/items/moonDial.1.png | Bin 0 -> 1778 bytes .../thaumicbees/textures/items/moonDial.2.png | Bin 0 -> 1794 bytes .../thaumicbees/textures/items/moonDial.3.png | Bin 0 -> 1821 bytes .../thaumicbees/textures/items/moonDial.4.png | Bin 0 -> 1815 bytes .../thaumicbees/textures/items/moonDial.5.png | Bin 0 -> 1824 bytes .../thaumicbees/textures/items/moonDial.6.png | Bin 0 -> 1810 bytes .../thaumicbees/textures/items/moonDial.7.png | Bin 0 -> 1822 bytes .../thaumicbees/item/ItemCapsule.java | 4 +- .../thaumicbees/item/ItemCrystalAspect.java | 4 +- .../thaumicbees/item/ItemMiscResources.java | 4 +- .../thaumicbees/item/ItemMoonDial.java | 55 ++++++++++++++++++ .../thaumicbees/item/types/ResourceType.java | 4 +- thaumicbees_src/thaumicbees/main/Config.java | 6 +- .../main/utils/CraftingManager.java | 7 +++ .../thaumicbees/main/utils/MoonPhase.java | 9 ++- .../main/utils/TabThaumicBees.java | 24 ++++++++ .../main/utils/compat/ThaumcraftHelper.java | 4 +- 20 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 thaumicbees_res/mods/thaumicbees/textures/items/moonDial.0.png create mode 100644 thaumicbees_res/mods/thaumicbees/textures/items/moonDial.1.png create mode 100644 thaumicbees_res/mods/thaumicbees/textures/items/moonDial.2.png create mode 100644 thaumicbees_res/mods/thaumicbees/textures/items/moonDial.3.png create mode 100644 thaumicbees_res/mods/thaumicbees/textures/items/moonDial.4.png create mode 100644 thaumicbees_res/mods/thaumicbees/textures/items/moonDial.5.png create mode 100644 thaumicbees_res/mods/thaumicbees/textures/items/moonDial.6.png create mode 100644 thaumicbees_res/mods/thaumicbees/textures/items/moonDial.7.png create mode 100644 thaumicbees_src/thaumicbees/item/ItemMoonDial.java create mode 100644 thaumicbees_src/thaumicbees/main/utils/TabThaumicBees.java diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt index 603d05a..286e72f 100644 --- a/thaumicbees_res/changelog.txt +++ b/thaumicbees_res/changelog.txt @@ -1,3 +1,7 @@ +1.4.5 +Added the Jade Moon Dial - tells you what moon phase it currently is for breeding purposes. +Added a creative menu tab for certain Thaumic Bees items - misc resources, capsules, tools. + 1.4.4b Ported to 1.5! Wooo! diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml index 5a2cc5f..6f33b40 100644 --- a/thaumicbees_res/lang/thaumicbees/en_US.xml +++ b/thaumicbees_res/lang/thaumicbees/en_US.xml @@ -5,6 +5,7 @@ Handful of Jelly Babies Thaumium Scoop Thaumium Grafter + Jade Moon Dial Greatwood Planks @@ -99,7 +100,7 @@ Full Moon Waning Gibbous - Waxing Gibbous + Waxing Gibbous Waning Half Waxing Half Waning Crescent @@ -108,6 +109,7 @@ Thaumaturge's Backpack + Thaumic Bees Esoteric diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.0.png b/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.0.png new file mode 100644 index 0000000000000000000000000000000000000000..e565a33cfc4f1749088029d9756a1853abc233d1 GIT binary patch literal 1805 zcmai#3sBQ`7{EJWiugptIi?U>ABeO`YKyeCLfcSUu!>NmPML-#g$&x%BuD{4raP5~ zI8^3)V~C1RbPm*skAZ;7LpF8CWZuy8HQ7YO7ff_10=hf7nUn$Z|M3`en~r5AA- zhvRUM&>I+oZno4&ngytx5!lRDR+__+`P;0hF%D;dXgr3n$hobj&T;_)lXD}*I!I?# z;jx4!nZm=9=je^eaYhNo^`8aEY*JQ%8D~(yW{$VeQk$IHtyjwK?bjd|=th`0IroiI z23;tiA}JgY3n0D`@`V9kkpLD!5|P9Q5JE5n!a@+5!G|HKc!m^$fu4uUTB9(NGz?Mq z*kVs|ZY;xCr68D?m?%h`E+DBG5SBnZU@otfy~6FkAc7TIilMu?Yihs1<|-kUgYs5Ht31)&wfP+c;(f@p#;fTNs*U z;Xanll1|r$zgMl<+(*+)82&c4_tLaJ$%=zvI87!{Mz+W%p4~00R7K$^LsEK@jPK2O zXe`N)bS!BFRN-O)3`7zZj7+58;c*0Ia5PU<* zCA}AgrLfYArN_T8y|Bk#pJ51O$Oe z6-u#MsSra7u|x^OfkK6!M2v_KM50poDQ5_Uy|M^tOt4p>R~CCK3->E)?`M0RqzFzC z%WzChk!GN~7E+>LUqpfZ>g$ok`t?Pm?pGFModNCL`A)a?Ua=!!-}cQOd+3{9+`^75 z#m;7W=a4HL&VVv4qR`u}e;FR7**I@(TK$=>)a|vBt9kBI+hc^U1DwDgAfJgVMkxzD zMf;ix4hVR;X$SN3n+~u1ae7O6ewJoZ(NI-^*QJxY37B_QcRcl?zG- z)~P4dP^M#>=Y>a(D8C8SnvVIk*VPAve4br3I0G3laFyc4gBPRMSLa48_-NPloQkpW zvsT_L^%(kh%c!E@?Vp}wvJIZDYsI>zjDU!U(L4A+kd9ZM_|3Vex!VgS9=PUQHTEyF z8~0JoRoZ2*E|z;#urTX)FkF$~P@mvYz4PcP=S{gY7WmWYeNzmJ7gxWo zwH&X&gc+p#Tc3_Gn^Hq2=tqq-uyGg`9(+8whg)y_2gkZ-WFa5jBw+2cxmpJlt&+RT2Oac^ddFQ_CS{H zf23q_T;uYRlZTY0ypqfAg#!n#PMaAb(|c*0l|qL=C&BuxrFXlC;lJFzBk1Ct;{-R% V1#jJQ%(MTXw1IPw!^$Nq{{?`|r5FGJ literal 0 HcmV?d00001 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.1.png b/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.1.png new file mode 100644 index 0000000000000000000000000000000000000000..1aa29dbc15c0efe50d3fdd04e0a864f804a88d20 GIT binary patch literal 1778 zcmai#3sBQ`7{DvS4iFr2s0^pX3W|?5Nok=CR4EOwjVcxtP@IG&lnk1LBz;iPDV!qe zP7vogbs_>|xKlSL;A9hgOneN^+e3zP4yUN+4Sb-d=!B&R= z^F+8vH1;-`l)|Uz;t>OFl41@-BQB>;sKk{F;67zmL|VL7CdtL6bR2!=pd2120{7(x`G2m}K|k65tA;+cpZ zjUKWkoYdkho@Wpcv|6oFYp|4NjUcR2sX#~u%48COkZ^evkJ%&?H)B`>N^l02WO$OM z0Eb2_gEsSOvEb>;5KPR7T8bM=laMgbhA|*4g&ZLbg1BLXW6W&MpmE#)5;=s4pm>cAQU-shQloe(Xs@_(`*t==L}~& zA&cf|E{kRWZK6U71IZ+X(^l>^oY4^2TLHi1Xd(L5F!*n4oe`R2GC1XN8@B> z-WyREftCM3h0@~~kNq!<8<0$zHDN;jNk_MW3}qa&rqdyD6vtzffrvxZVj(msN#ckm zQV|`gQOGq4RU`~Y$uvrp0+pkvN~=*uhRS5avM6mZJE|}&i@%apj4JEsXGfh7lwe5< zfk(5n2^g#eLXPf>Y*c+iviRt}1dl2U3eJFz?tHCVhp&VYaBN3rPdJQBFF^?-%L=m@ zn9(*-E=Vtp3-v=T^$9(4z?j zn_Ra5cVqH|ka=g3{EgUrcJ+CsCX)oih3Qf(a;#iQoy zZCAJcsUG0kh&`O|hA}liyInle$tX+WXI9APT)pJc?3`X2++7|0+*uQGcBki8CJY<1 zEuebVm%d;a>(SfW>lIac`BeF{bibK5K&8IcCr#S!9no&y`FR|^sIF+TKeCZ)JW!GA zN!>bI*)Pr7wV}Mwzd3PF;NHMaOC$MFh|?-W}qLQ;V$4qI;W9-d&P=>le4sZNE}-S)O*L;XL`U?XT=(3Ax*e9b0jz|Aq?Yu4mSn;XH+THKYF9#)ED+8AXht<}%wzg{SOUlyQmn~Tm-jlb! zqa$^fz5nL?UAvbjyY#(SV+-FKxHhz9vuD{PpD4`-T}#vY?CNo|ulNQuJv%c8uL5(5PbRb)+r5chnl7o{@!)+Qm5C`Afq#L zSz3SlSo6V3@A~!HgodYIEZ+b9jqOQcSDUZpJGX3eU4%l9v)#{5E+l4@OuI;r@M$$wR}SVBO-;P9vrj#Cb%b&5wSpsw>-7F-9-VeO(Ub4mSE;%CBuoBY zWnD_`^$P6%gti^C$&BSZ_Fnihuhzuu#t{OPnAwA8W{UqWp`w;DEVXm r+L}3!{mOi884r3}E}X7^F)>}#V~-Ledrs6i{z7q43(-T7=>`7+_l=P` literal 0 HcmV?d00001 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.2.png b/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.2.png new file mode 100644 index 0000000000000000000000000000000000000000..f039cb301ab25cc6a9b05eced6209f479a88d953 GIT binary patch literal 1794 zcmai#dr;GM9KdUb6_q-eh$5cE`WOmrl0tz7I!PNI#T6+Og`qn`lR~6zLYmTo2gpM~ zc24mRm8m!wiZJGF;`5x-xgj!Tx_P>(r{|_14iq2rdEk~Jpu59c?vmf*KHvBEds&y5 z5G$TAeS$zB5NqSGB!2aDz3w9Z>;LE%3!MyZ%qBS?gUqC?DoNkb;}U=(RFb6% z9i(G4WEK^d&yvac2?k?+woyq)7JdLkIuTxhh2(I+X)#-Eh*KpQ)Qj+Y*EJ{s1`#e> zC3)pksxA@G&@2fkWRTPdg~C8+hzt&alp)F>Kn}qW2+KhzObSDYA`F3GVCa$X)>y)X zBw;Z_w)m4ulErZh0)h^QL*@vU(QGCNE0szRl7n)&lqaONJS&GgrB>VQVGS5*GqM!J zQM46sX~Z*VJExNHp1umf!i=c3+J@4^Ck%Ar3<%30S4e{(VI1KYJ8K>^P8dPbOj<}Q zXX9CTgyplO(~aPxs#?SYd!5gfBn{EQR|6iCeA|{%(;C%imSGR(UHFMCKPKRi%HV(HMNiC+5@S({l zia=0xD2!pj3RIy~!*H}54Oc3#5DZgl&~SB_Ts|y|(MG$g3d6F*YuV7Z%DVd5RVM@^ zSt^$#Vp!S&4AugnM)gGzqec~P*Eb|fjOxpvY}i|U0eNRYS9iYAt;1LR2)MQ*v&SDs zrkAwxBg^u$S-G};n?NA^MvI{a=asVL<#FEnX(~siBiH1(ykqmqf%)-1MLuWT)&=d0 zYYsZ#ztU^|{`|@)_mY~D!nhZjfVztA_HqFGVq9s>PrbFC8uc%yFQ!~Dmu_Ev)t>7x zS%ZID;(w*v!y)Rru6$H*d;5mO_}Zog%}WBg<>jpzsJy!D%hu?W=&>OJBx+Rv>XUl8 z!1@3A$(Ge28;L@d49!`zMc%Wl8Jm3Rspn*?hjn$Ss; zUp&7)<3Z=M8(xA%YqcJgT#DZJqwHJ1M|a0hVzH?-N)n!JHt;ECVkr=Y85LD z3(^;qd2KD3Vz{gBDV`UZRpj<}>+hzopU;SS|9H#AnTN|-6m7NC^oM?d;*|A)nvHRD zHYPNP#hcC+7omW#uJ7di{9|XUNnw-z@U?rpmb?tF67SwK&&S8-#E~OYgcq{YHb1!4 zG4brVb2p1N&KaM3v|!DNKXO)FtDm&x%$oiyy2B8=!;+gDiM5OT)2FW5`)5~Ygy+Go zlfmAkbQ@rLPnUhkK$rEEPCkCnSzU1ZY0Wa(<=%mqtCpCWe3j_BsqID^dLECTR$L`# zW_|kCV@c>@?onv7-a`*UyFFnWuUWrQPc6s%qSlya<)Q+Z~IkceZsm zyvXU@E{m-{FZ}ML`zN!Se93zQ9%|O3%HPW^Uif1(n^x+Kow00#u&?nk)>DbsGt+-% zJYFjO%8K1D73x>CJly&mDXra0W&E6w6}i6-71dWnnbX7vBI0vSk1zk>d-If!Dfh)? zXnEEXJR=RN*sm8a^BtF-D7n)hU!UX)SFN5G(7)?t^UePB)nf!L(SUk`Uq_(pucVDm K!1k(Fl>7^jhmf8C literal 0 HcmV?d00001 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.3.png b/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.3.png new file mode 100644 index 0000000000000000000000000000000000000000..38426a45a7ab8c80d29a84cf4e3464ec93e6ce13 GIT binary patch literal 1821 zcmai#3rrJt7{CifEr^pj#(0R{u4DwIy}MeVJtCGBR~w@P$(Zbpw^?h{i<+x($Uu#*A~5#{wv*lPS6@3c5tHOYZ)U{J!`1<%;9u zqGmaHI`MeCSuxR=np<6LuV6a&oj>v%=N1n(BAHF3Ggu35CV5JNPA7pF1D;8$Nu0>b zzCs4`c>EqplguWoVo@z^5aTvRY&DoTX&x_liPeN_btDUL}kW->89PNU7&Y2^gCBm@YyqMQN)$>M<3pf@t8RRNCcMY+B08UlfFgw-j) z7fvOs;(>75OacL7Sfqsm5g<@1Mx?M@D)$E@Fakq}1cHM^2#f{23c_vgot5VNaG-(o#ae8X8pKvLJN_4(m)zn zhGUUQmdlb#HHp7bt-&x!Gpw3?726wWMw4eEAvMX+Ic6|JF>~CSN`=N485TEc$rwxla-oSS zia?cNfe3~zk}Ct`VF(f-QOe{2m=we0;YwLpkVG;ei_zK~TNNf`iC419DP?W_Y^xKB zk!C8FBqGhU0T{0ZN=@xc(3JXK$`VuiBAZec;+%nO-T7L#PF!&#VB1d49(S0WUed^o zteKn5Oq1|O9?!ld22*ORUHU{rbYg;g!L`9$%TVCmxn1$w%5MKqQRAY-+&1mrxh8s6 zJvh?|gf~>JEG~*D7bsod9vhAt6YMT=$?n{ zy_HtzUaIr~=RLB#@3sxkzbDEnE9>2L#I1x6YiCQYlj_eBJjBcQh3Xiu!$ja7rC|MW zurks6uQgZ3ZWwpB-8^pEsgSh#`$vQ?_a6N9?94u`{UN()4{`)G=YeZq2VX999jJ9! zT@_aU{g{mRj{k*pU(dI0+)jJKuUgUqDGo#F?C^}01GT!w_`JP|t>1K)fAp?~UldvW zNd*R8TUeLAZ1G@qeSON}53#V`()qdP_9aE~s}^j!`DyB*;i$demK0yr+!*{%Gl=gdf>!Shos0_o$J;h^zqrQ zwvzTkfzcl`pWl~X^3#z%QG(XrPC0I$o#9{JnKvpPQXD+k(s-*WdrzTnT4}h{9g)f$ z&{)SA(H0Mf6QPMWC4tNS5cYl-<{I&|f5e=Sa`sVbob2+QihHBT6NB3s`5B^r^oDui zsTnoZlKtKIKQ&!jyxaa1xb_0ZY(OYlpd)XOIX5-K_KaQQ*3^w;4dv2T6xv(dT#&&} zSbWjluVS-7=GkGrcpVb7SlFj-J%+t54&jfsRaNpHsrzz>9?B z{>i0~=CSWn)0d5oUUg?GndH?Cjh^cU^o|GZo#%O#?I>*OD2ffOc8zP;Rfl_dd24^C dlxt_gypDyD-h0;8X4`&PF%fZCZP=;}{{k;=nvVbg literal 0 HcmV?d00001 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.4.png b/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.4.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c5f0d82369e6001b65b1b552cb3975c7943197 GIT binary patch literal 1815 zcmai#3sBQ`7{DtkFLB@l1?C_GUnp&oK7i(|v?WD)vxvY(nJ+>TXoV&<4bbAe-C#N# z=*D28QxNT(&e!h54L3Ih6`TrAMNSwh;BtG*T!NA{OaR;-Cg-_P@e5|Db&7Nu0y~7bXcboncKlpMRsXTOl)@F=$PvL$$Pp!)b!jVhWHCO=L8Z zs7f7eGT(TG)%av3JYFnP2pQXL@{56NN-k?pL)kSzI9Rx_fkv!9)HLNSUp z=1^n|%b0+{TA;>}eNm67?}aQmvMDHkuegvG`;o0L4!_!OA{K&HW zY?k&ReFA|?gBDXIS%1q)%#2N3Jk3#YP0@3WJl|DtSn2-_aZFh_e>Sd?3W7D(HlpD#mZ3wuBa$rbxK0bkC~Zr!}j&#FJ51Ek_<# zb~v5{-iE>auyYsgK8%0I7p-{XFYC0Fw^F8`CY7VAT%@sH?PZnTq4&GH=SOa-wU&hu^jsqrnnoUV2mUwhe9Rr~Z|>$X|sB(yIkxmkO)=h*2PDPdFKhSYsfS8dSA-pDxr zcq_5&y`r0&X74`iIdyAX=d%hopQstBf#oWD@SYGASBW-6gk~DX`~>V++L~JBzo~a` z{lGf=oqINSn_)uFqj5_b^R8bhI(Q}dzO~=?@hJ!CCDjy53S;b7H)G)WNv&R&D!KIw zu{%F|=Nzq=Rf?2M&Tm<{tn^UjsT^Os-}dtI@?ibi4SwJ4FQ@|o#~;TGMvqO|wGQzm zs=Cbw-Vz?Lxw@%!AW?JV(kJ`B_T09nJLc2A?kN{;)zM3j=ZtR4uK(p(z>Uu(GY^Fn zKX^3N-f15@wH)kUFC@%P&mZtbMs#wgdq z-$&hCRG)g`%`V5S1Qdd-NceWlx!?46=Uy{% zFJJg%S?$@6ztABoGlE-U2M#LtOiVSm>mQ_irk;%H)2e3Ib+K@hZN=GwGTRoN!vhx7 Ww5c)Av2d01SEbd&VF%Tz`Tqh#Pos|j literal 0 HcmV?d00001 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.5.png b/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.5.png new file mode 100644 index 0000000000000000000000000000000000000000..025e3c60f5c515d5ff472d657790617e012fb8b6 GIT binary patch literal 1824 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 literal 0 HcmV?d00001 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.7.png b/thaumicbees_res/mods/thaumicbees/textures/items/moonDial.7.png new file mode 100644 index 0000000000000000000000000000000000000000..9d8dedff94554b9ce662b46a180cfed431d6434d GIT binary patch literal 1822 zcmai#4^$I%9Kgq%L>NzkiHM5lL?YdGcVoltWWd;g%p47vN)XDiyN$`V8+S(xGz@_Z zuuu$Nit;ct@lXCKN=ykwFcdL;&v+3=8kr(SRv;?+?1qB&p1kh8yWgMp`TqZY-xcd( z7kRk*xpO!i4^0dj&#s=%*Ugpv&idyu#xB#Cs6-}#G&0#3MQ~I&nMME_D`q0%2@KE4 zJWGUfI1_G|^@&WPb_rr2tzyi{h#gitE6w4AhCA$-A%kFmG{R)IDFuHXZxjG#Tq#&C z(?VLinn*Xt{*m$#5isM2@7E* zYz)n^@EFTxNvj>hU#Qk<9iwR`o_H493u#)PV<*6Pf+n*l16yR{9H(1$L`@MGLsEK@ zw2Wq4mrgPyole>Tb%IO`1Ix`eoXn=5;|UaF2&I6{ey|9VieQ-@f)KU#x+<+KK%8If1H#@r(wA)N0*0fqgW1|_&W*{`EQox2L zHk)xo6&WIvhp5#mnIaN~qa-T1LWW9FRH0VMBNs>{qp~Pz$Z}R;R2F|Gi;gSn>}O}4 z5R{(+KUi8X$iMd`4p6h}H54`r3>H1Drm$fb$KsUvB(f+HFKHL;s6WqP^*icodiK41K zhQls&nszjFbXV#Y&u){{C5iM)i=t~(LLYTB?OHK+nvPR@rFcO9Yvwv2wZ&~h>eqF3 zyg2^m(!s)I{hg&T0oOxmLHj?@Zwrqg-T1|E!2m|Mi~+&FH+CT74m9Vdg4& zLcl!Ln*;UXKYD1&A>~6?sY)}D$mG-^|R^RY5m|wZ-rAXayfjsXXr*W4f+2iWO zDT~VyJ0~zPZ_uaiwykN$N2^b!`WiNeA3I)FbuEA9g-P-hdSgPn^$JgSksl%TyWZ5? z1Fy*cp`$zR^@(W#(S<99v7=p^E8cRcb}wp4)5PCTE`B`CyP~tHiOXx7=YF8$RI2CX z2US>JUf3VHjEw13Ot&`q%T5dA`^v-QHvho=FZTs5Eo>9E){0t+*V{g}*muoDe(8F@ zZE6?x`MH8Y`h$enL6^=&>38pj%DXF%Bw{zNFFe{4Gmkj)=vKw_))d#W#%=GdFr93@ z<90J>?u>}8`YTob`TMd2=hobJ`$l*oE^laceXTHMxPvPXOuLiw=#xibrQ5$!;J5DU z%ej+uL#2gx3w!q<;J(l1zZ!HoqVbYT-xsw9DvGj$@9<8$ou7DBnCZ2JSlk?A;zb_f z4Iddqd)<59xF)sKVEl&{Ps#Zww;l3gl9a}8+ku7iD-Y-Y?NIifZeCmB*8ID$_2=0o zxxq^Uy}|u|6>%HCpS*l;>0y`3VcGhYqouu^+wE@$O|7Q8HahsfHAJIazuiIhDV`yr iJ%*koCob<^%k$;L`e@?3y_DU~Kb9sc7Cji5y6#^UOrOU9 literal 0 HcmV?d00001 diff --git a/thaumicbees_src/thaumicbees/item/ItemCapsule.java b/thaumicbees_src/thaumicbees/item/ItemCapsule.java index 43ce439..caeab7d 100644 --- a/thaumicbees_src/thaumicbees/item/ItemCapsule.java +++ b/thaumicbees_src/thaumicbees/item/ItemCapsule.java @@ -10,6 +10,8 @@ import thaumicbees.item.types.CapsuleType; import thaumicbees.item.types.LiquidType; import thaumicbees.item.types.PlankType; import thaumicbees.main.CommonProxy; +import thaumicbees.main.ThaumicBees; +import thaumicbees.main.utils.TabThaumicBees; import thaumicbees.main.utils.VersionInfo; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; @@ -34,7 +36,7 @@ public class ItemCapsule extends Item { super(itemId); this.capsuleType = type; - this.setCreativeTab(Tabs.tabApiculture); + this.setCreativeTab(TabThaumicBees.tabThaumicBees); this.setHasSubtypes(true); this.setMaxStackSize(maxStackSize); } diff --git a/thaumicbees_src/thaumicbees/item/ItemCrystalAspect.java b/thaumicbees_src/thaumicbees/item/ItemCrystalAspect.java index f82fac0..4636a35 100644 --- a/thaumicbees_src/thaumicbees/item/ItemCrystalAspect.java +++ b/thaumicbees_src/thaumicbees/item/ItemCrystalAspect.java @@ -8,7 +8,9 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import thaumcraft.api.EnumTag; import thaumicbees.main.CommonProxy; +import thaumicbees.main.ThaumicBees; import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.TabThaumicBees; import thaumicbees.main.utils.VersionInfo; import thaumicbees.main.utils.compat.ForestryHelper; import net.minecraft.client.renderer.texture.IconRegister; @@ -21,7 +23,7 @@ public class ItemCrystalAspect extends Item public ItemCrystalAspect(int itemId) { super(itemId); - this.setCreativeTab(Tabs.tabApiculture); + this.setCreativeTab(TabThaumicBees.tabThaumicBees); this.setHasSubtypes(true); this.setUnlocalizedName("crystalAspect"); } diff --git a/thaumicbees_src/thaumicbees/item/ItemMiscResources.java b/thaumicbees_src/thaumicbees/item/ItemMiscResources.java index fa3b726..827af46 100644 --- a/thaumicbees_src/thaumicbees/item/ItemMiscResources.java +++ b/thaumicbees_src/thaumicbees/item/ItemMiscResources.java @@ -7,6 +7,8 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import thaumicbees.item.types.ResourceType; import thaumicbees.main.CommonProxy; +import thaumicbees.main.ThaumicBees; +import thaumicbees.main.utils.TabThaumicBees; import thaumicbees.main.utils.VersionInfo; import thaumicbees.main.utils.compat.ForestryHelper; import net.minecraft.client.renderer.texture.IconRegister; @@ -23,7 +25,7 @@ public class ItemMiscResources extends Item { super(ID); this.setUnlocalizedName("tb.miscResources"); - this.setCreativeTab(CreativeTabs.tabMaterials); + this.setCreativeTab(TabThaumicBees.tabThaumicBees); this.setHasSubtypes(true); } diff --git a/thaumicbees_src/thaumicbees/item/ItemMoonDial.java b/thaumicbees_src/thaumicbees/item/ItemMoonDial.java new file mode 100644 index 0000000..a232b7e --- /dev/null +++ b/thaumicbees_src/thaumicbees/item/ItemMoonDial.java @@ -0,0 +1,55 @@ +package thaumicbees.item; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import thaumicbees.item.types.PollenType; +import thaumicbees.main.ThaumicBees; +import thaumicbees.main.utils.MoonPhase; +import thaumicbees.main.utils.TabThaumicBees; +import thaumicbees.main.utils.VersionInfo; +import thaumicbees.main.utils.compat.ForestryHelper; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.Icon; + +public class ItemMoonDial extends Item +{ + @SideOnly(Side.CLIENT) + private Icon[] icons; + + public ItemMoonDial(int id) + { + super(id); + this.setCreativeTab(TabThaumicBees.tabThaumicBees); + this.setUnlocalizedName("moonDial"); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister par1IconRegister) + { + this.icons = new Icon[MoonPhase.values().length]; + for (int i = 0; i < MoonPhase.values().length; ++i) + { + this.icons[i] = par1IconRegister.registerIcon(VersionInfo.ModName.toLowerCase() + ":moonDial." + i); + } + this.itemIcon = this.icons[0]; + } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + par3List.add("\u00A77" + + MoonPhase.getMoonPhaseFromTime(MinecraftServer.getServer().worldServers[0].getWorldTime()).getLocalizedName()); + } + + @Override + public Icon getIconFromDamage(int damage) + { + return this.icons[MoonPhase.getMoonPhaseFromTime(MinecraftServer.getServer().worldServers[0].getWorldTime()).ordinal()]; + } +} diff --git a/thaumicbees_src/thaumicbees/item/types/ResourceType.java b/thaumicbees_src/thaumicbees/item/types/ResourceType.java index a6023c7..0f96958 100644 --- a/thaumicbees_src/thaumicbees/item/types/ResourceType.java +++ b/thaumicbees_src/thaumicbees/item/types/ResourceType.java @@ -11,8 +11,8 @@ public enum ResourceType // Dummy items for Thaumanomicon research icons. // These won't ever actually exist in-game, and so - RESEARCH_StartNode("startNode", false), - RESEARCH_BeeInfusion("beeInfusion", false), + RESEARCH_STARTNODE("startNode", false), + RESEARCH_BEEINFUSION("beeInfusion", false), ; private ResourceType(String n, boolean show) diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java index 2833137..ffbc00f 100644 --- a/thaumicbees_src/thaumicbees/main/Config.java +++ b/thaumicbees_src/thaumicbees/main/Config.java @@ -23,6 +23,7 @@ import thaumicbees.item.ItemCrystalAspect; import thaumicbees.item.ItemDrop; import thaumicbees.item.ItemMagicHiveFrame; import thaumicbees.item.ItemMiscResources; +import thaumicbees.item.ItemMoonDial; import thaumicbees.item.ItemNugget; import thaumicbees.item.ItemPollen; import thaumicbees.item.ItemPropolis; @@ -35,6 +36,7 @@ import thaumicbees.item.types.NuggetType; import thaumicbees.item.types.PlankType; import thaumicbees.item.types.ResourceType; import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.TabThaumicBees; import thaumicbees.main.utils.compat.EquivalentExchangeHelper; import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; @@ -76,6 +78,7 @@ public class Config public static ItemThaumiumScoop thaumiumScoop; public static ItemThaumiumGrafter thaumiumGrafter; public static ItemNugget nuggets; + public static ItemMoonDial moonDial; //----- Liquid Capsules -------------------- public static ItemCapsule magicCapsule; @@ -285,9 +288,10 @@ public class Config } } + moonDial = new ItemMoonDial(tbConfig.getItem("moonDial", itemIDBase++).getInt()); + // Other tools I might need in the future itemIDBase++; - itemIDBase++; nuggets = new ItemNugget(tbConfig.getItem("beeNuggets", itemIDBase++).getInt()); nuggets.setUnlocalizedName("beeNuggets"); diff --git a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java index 14c6c31..e0ef583 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java @@ -120,6 +120,13 @@ public class CraftingManager 'D', Block.dirt, 'w', Config.wax.getStackForType(WaxType.SOUL) }); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Config.moonDial), new Object[] { + "rqr", "qDq", "rqr", + 'r', Item.redstone, + 'q', Item.netherQuartz, + 'D', "dyeGreen" + })); if (OreDictionary.getOres("ingotCopper").size() <= 0) { diff --git a/thaumicbees_src/thaumicbees/main/utils/MoonPhase.java b/thaumicbees_src/thaumicbees/main/utils/MoonPhase.java index e7237bf..71bfa7a 100644 --- a/thaumicbees_src/thaumicbees/main/utils/MoonPhase.java +++ b/thaumicbees_src/thaumicbees/main/utils/MoonPhase.java @@ -42,13 +42,18 @@ public enum MoonPhase return flag; } - public String getName() + public String getLocalizedName() { return LocalizationManager.getLocalizedString("tb.moon." + this.phaseName); } public static MoonPhase getMoonPhase(World w) { - return MoonPhase.values()[(int)((w.getWorldTime() - 0) / 24000L) % 8]; + return getMoonPhaseFromTime(w.getWorldTime()); + } + + public static MoonPhase getMoonPhaseFromTime(long time) + { + return MoonPhase.values()[(int)((time - 6000) / 24000L) % 8]; } } diff --git a/thaumicbees_src/thaumicbees/main/utils/TabThaumicBees.java b/thaumicbees_src/thaumicbees/main/utils/TabThaumicBees.java new file mode 100644 index 0000000..07a910a --- /dev/null +++ b/thaumicbees_src/thaumicbees/main/utils/TabThaumicBees.java @@ -0,0 +1,24 @@ +package thaumicbees.main.utils; + +import thaumicbees.item.types.ResourceType; +import thaumicbees.main.ThaumicBees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class TabThaumicBees extends CreativeTabs +{ + public static TabThaumicBees tabThaumicBees = new TabThaumicBees(); + + public TabThaumicBees() + { + super(getNextID(), "thaumicBees"); + } + + public ItemStack getIconItemStack() + { + return ThaumicBees.getConfig().miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION); + } +} \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java index ec3c602..bef8d37 100644 --- a/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java @@ -537,7 +537,7 @@ public class ThaumcraftHelper ObjectTags tags; tags = new ObjectTags().add(EnumTag.WOOD, 10).add(EnumTag.PLANT, 10).add(EnumTag.INSECT, 10); - ResearchItem startNode = new ResearchItem("TBSTARTNODE", tags, 10, 1, Config.miscResources.getStackForType(ResourceType.RESEARCH_StartNode)) + ResearchItem startNode = new ResearchItem("TBSTARTNODE", tags, 10, 1, Config.miscResources.getStackForType(ResourceType.RESEARCH_STARTNODE)) .setParents(ResearchList.getResearch("UTFT")) .registerResearchItem(); @@ -548,7 +548,7 @@ public class ThaumcraftHelper tags = new ObjectTags().add(EnumTag.INSECT, 15).add(EnumTag.MAGIC, 5).add(EnumTag.WATER, 5).add(EnumTag.EARTH, 5) .add(EnumTag.WIND, 5).add(EnumTag.FIRE, 5); - ResearchItem beeInfusion = new ResearchItem("BEEINFUSION", tags, 5, 3, Config.miscResources.getStackForType(ResourceType.RESEARCH_BeeInfusion)) + ResearchItem beeInfusion = new ResearchItem("BEEINFUSION", tags, 5, 3, Config.miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION)) .setParents(starkHint).setHidden() .registerResearchItem();