From 8bd7974a748de4d70f0d62d1d0074e1a2c1b8c15 Mon Sep 17 00:00:00 2001 From: Gig Date: Fri, 17 Apr 2015 15:53:33 +0100 Subject: [PATCH 1/2] Fixed some gui textures --- .../assets/techreborn/lang/en_US.lang | 1 + .../techreborn/textures/gui/alloy_furnace.png | Bin 1757 -> 0 bytes .../techreborn/textures/gui/centrifuge.png | Bin 2200 -> 2316 bytes .../textures/gui/electric_alloy_furnace.png | Bin 1796 -> 2142 bytes .../textures/gui/industrial_blast_furnace.png | Bin 1816 -> 2113 bytes .../textures/gui/industrial_electrolyzer.png | Bin 2182 -> 3475 bytes .../textures/gui/rollingmachine.png | Bin 1921 -> 1955 bytes 7 files changed, 1 insertion(+) delete mode 100644 src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 9e87397bf..3e7a3f662 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -9,6 +9,7 @@ tile.techreborn.rollingmachine.name=Rolling machine tile.techreborn.machineCasing.Standard.name=Standard Casing tile.techreborn.machineCasing.Reinforced.name=Reinforced Casing tile.techreborn.machineCasing.Advanced.name=Advanced Casing +tile.techreborn.blastfurnace.name=Blast Furnace #Ores tile.techreborn.ore.Galena.name=Galena Ore diff --git a/src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png b/src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png deleted file mode 100644 index 0ef7b9c51afe635fd3dd56180ee6cd038ed0f665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1757 zcmaJ>3pCVe6#wSm41)+YDtSz8sU?pxWjtqUhcU^ZWRi(d#FFQ>!-g>)Mc!7aRvu9% zd6q~;quL#d%~X=tF@u@HdL*wC#>|dWXHR>!eBb%b{hj-}_kQR8?m72@BblfuuPzS& zP$bzB4gmm@LKr~GNDVdg)+woxIbla60Lk(#XkcYYJ#xXeu0H{w^kn(L>N5SurB2y1 zBztRFo{Tce;JZZ3X@oSXvXUst+6 zG2Ui;gXHO;Zt`KZz0TSAb;XCT|6XxucxE;EW<6e~A=xelkF078E_l@YKIi4Z_(_h{ zkI`dV!7YQwR2n{>({IjBOCYyEN3DIvW( zzcVqh=(4t8pw~npD@r`Qj71`<)ez)}X$ZyGsF^m@mx=qX7tE6 z3R!R7X^%JITG^FUl+k){>n6{WKsB(G4Q?1>rwnVF$)W+KdB%(1{XA=d$cpCI3pzT} zB@6upa^U$fu?L66XIx2s`nIEmc6#b(E*uF`-NeLeRug0gkXAH#JkpGTY3Tjv)&G14 z8ocI(zsG$PH=XNs&<`>`L7Rb=Fho3YoFKX@tTpW8 zRs#rsa;Mv?%7^;g>B0`b^69@j%bJ_o)R_0~E0<@Z@R|*0XZ=QZEi5roY>EzXLQa(M zRBUIXjB0q$%;HkHSVS{QeCg}lg5}w6gK7cI91YM?>)1-lc|~uO2deIJNU-z6;2#QZ zz<0{a($sW*Fr1r@lL{EOd%OREEWR30%@aXD&Vd1A#&2f>+SGQ7c?8J94K!;HxH6CF z2{bcHG4r`;CDI6AW&ppr?m!2Bq|2}7%|jY7JAi&X-I-yDr6C+EiI1Pq9IuAp!Q8F( zk&AaR`u-YK2wK1*HbxdgLufE6w&{uzzw2VK4Iw1Hg#ch(ab#BYK7R)V2==O{Wswx*+ z9#%xJuB@!=rlnj9u1A`^;p{nma1@4_*QRh<&*VfNq56u{XuX$5%$ySR0S$qlbup>% zO#xe5P^oti01lJ^et98$0hS?JKb2ve5!SlzDQq&(wCan%|AZ=o0#aa$0cLF+mX25EhxDBZ`oLy}kK{%16572-K00fX<0Z8T#QfBM$n^D-s+0mNR zlNz_bPfje{k(8KtPQkElOGe0Tqc#yL=KM2H0--)y!k99yH_m#HDU_#8DR!OL<8AQi z4WX+1Y5KorzGzPwBuLw|&Cr83vZe%8<`qbZK}7!gESQ*s->93OrUf)Ee#f>F>Rvqa-{9v6qbETxIJTMM#&$rYc2B z!=AQU0oF7?;j8_BmImrqmP#ZSdW0r$W@ylxj>ME`QV_MD)c@5@d^jyaCDYs0Mfl4^ z|NcTfW?5gLx%z946&V!M#6V3+ZqHJ8--TkFLdKpYZDbh_`i9&qOkzc9Me>`&T`_A# e@^eYYU6NH7^5pGy-$PJ<^pLE{go^#N*na@>oSKFJ diff --git a/src/main/resources/assets/techreborn/textures/gui/centrifuge.png b/src/main/resources/assets/techreborn/textures/gui/centrifuge.png index c3bb9bbad4f501490a46ef55235f323adf3c85f7..4185519ef91c4660b611cc2000d3a3ae6d28d500 100644 GIT binary patch literal 2316 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&di49pAxJ|V6^adUI?(9qCx@?sa{#IDMTT$K~ODJy(iR^)<`pE2ih_UMnhl_hQPe%xxAoUQxfDC3{0pa888HYXIBMA5odu% zWHAE+-vJP2%(~Xe2^3^6@$_|NzsDvd&T6@8b;)O-kVJ`VL`iUdT1k0gQ7S`0VrE{6 zUS4X6f{C7io^j8!=>fnZC&<&qF{C2y?d;cK!iFMl?p=@mHfgNb%J=^Ngycy-t(*hB zyw7bEK7Y^t7w^ee6E=HZGK(!ad|~Th1D?NpD;G}6dy#irQBs0?f8Fm@OIEE|kiGKX z?R}FQu1;OqP_$mm!uqw>y!e=DCPD`HUI)y(o4&ZO=~h}jzh5@-E4#R&L^kY-jF0`#q4VJI(_Q~dww~f$wWvvL`hoNR zuFp1NT*UR_cmMq)?uzfFe^o!oO|aPiGbSiB2REB>@dojJku zi7z04b*jmB_7%Tcv{tY%uI1#|&k}WmMR*>QRE1P)AjNfeFjM$Ck}||2t8Vkt1Rq!`f%KW?+P|Buw>jxQ(yq;ewW9@6!M*g=}ICKlRyJQ?`<9yg#%#?zyI@P-${$$ z{%|y~fp0^a*{PYr+bg&)Oq#nRHi{dhkOidu!j7{J3~=6$&l=g8y62cm-Wffv*tU3% z<%*-x4QaPp9;ejd)bqjmIH?fH;OLUd|mSR=U9mDFImP9e>8pDA_jILR81qqy&&F$@>$te zAL%UM6=-Ox&jM$xS6ITIyM;T za0IlmGM?I?;2vznV(0Csc+#^KSOPJ4y85}Sb4q9e0LD-i Ac>n+a literal 2200 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 literal 1796 zcmb7EdpOit7(Tygm{F3UCxj9sEhD5DMrLf|RvK0=OSx2T+r0(R--j#WXfe-oBgq^?Wz9Q&Uw!Bz0doc_dVx)-+8_S2a5IbrK^_$ z0G8X@kR1VlU)K;)f(|xaYtz5&?XH#g)Yh4$&SvnWwVb_spfheDVb<|1I zTanG9b{H%wm_ItY)wr_W&FnNvI_}1(#r3u~Z-NNs=Glh_N8gwCv|M^WHnUl*^b0S? z_el1j8@aZorsjSQJ!JY}M1+9W!yMc2Hj>$9(OtbJJ!fyrff9A@?VW3jqg}0Do-PYl zrVqP$fqdLOD z)!SQph3k7_fxb{C%Uo%s5LfT$i`Dju8fKLXe zka|pb%4&A{1L_uSu0Gx@V1&P z%#=%FVF|w^?k~QmAYJApNd3Kpb+a;|%4*`#%f9W!8mIC`a1fG}i}R{n6)hylR_!@Y z*Ef0*3NqSr`n~!^Bkmj*PmasI(Kj8A{gmg@tX${o&i>$GfS=zLkz$Fv?zty^_I1Cq z+4`9$@Q8vwlws=*7OW8r4UIE4XFkbJ&`di&@3r>7ueAQjI?X0fz9* zi5r?A!+hMrXBZiCNpxMPTB(|5KH4@k z9;1XpdMoU-vl|;|Eq3LzG(q=WWd#ulkO9)WqS4sUP~P~@>3h_p92a>Ac_Bw$G<$qm zq?i~F5JlYP59hCoV`-2BQkGSl0OnGAbRg!Ou%Bz&oj|($Ow>RIVSoI_{^sBNxG;=aU0It~aq}#sp>Sy1MKc`pBlA zfv~6vTV_J^n&i#EYFGKNish#;V}kN7?!!N#Pn8ZXVkPV&ud9G``nwxOj2QCVO>K*!?Nh!ca65`Yav0t zr(Jd6`e-fE%8p?dFKjsy$l;d=9&tmsPcdJB4?_ko z|Ic#Kdl7s*#K&5VFFlJFst^!L{?F@gX*lFG0aGGNT^O-H>k=P6Y|FpbT9keQWI-I9 z2b)yYm_$Pnzld(si$P1Ksm9=-g#-y6Ur~UDmmbQpP#olW#PISKQqeiyj<>823hMel zS@3c7{^x>a2*VKJ(nC@UCBlYJ+f$v?;Wme(mblAo#4;pPlTuO$tEH2AO9A_s{|fK7 zsrtDoy{bP<^do$H#gZ|cv!50A%Tj+M^Nrg-|5#s>e~tTGC(VwAocYU=eNAuD06c6h LDdfWMy^sA3PF<$$ diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png b/src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png index 3d6b145e0e76a126482682e461508f2cdbf79826..542242ff74c73dda5f2811e091a879a8a4f888cb 100644 GIT binary patch literal 2113 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&di49pAxJ|V6^adUI?(9qCx@?sa{#IDMTT$K~ODJy(iR^)<`GeEhfB*-rqm`X=7UFdgVkDXaW(d1L1-*2FhM2TxeNpOBzNqJ&XDnmhH zW?qS2UTTSgiJpO;anG~q0l+e*-P6S}q$2L^t+!#99VA>II;{TDtHhPHWXbpX{*5!| zn3*)Ln|0=b-?@ABaWYxg&TMXK^$5J~YIn6X_U+cl84-cvuWN2`Y+>L3`-`2=+$1Mg zzvuDctqfw@0~rr(Eqd{36Gw4nsc@P~!?!5QEv!4V_P4y`+MrS2ZhwnukM3!6`Dtg} zt&X-7u|(XNzP-G@hjCs0saLn(E{eRMsW#>5^aJ-_eN5iL7{j>g)ocCyhV%BP<&XVm z%Za*I&mX*eM!+(LtGmlyhzOtJe-J3&erxY*oyDhQ6>{RzB}2b4oPAe1Eijc`pibxB zX}N@4{(^;@d$QOV#N)~j9F2SU=iYm!*`K4CO`h9xHsl>#H`Q+97Dfk)|CtP7d*hzk z-D1eNe~}3ogbWw1{$IV3q3XOu*_GWVWEj4Da&-S&3lw+w-6zJtaD=VmS^HG=n~Yyr z-!O#PHvVLOA-y|y^}GW)3}J7XPpZEZJ}mr>^UQO;7u)~F{hKLl_afN$GvkGQ<$G(` z-^AAcW8nYQl~Mg-e$GFJzvYehuD)gXC0@=f5p$d2K>@>yr_Br(xcS(Cwt-ypU@Bvq zy=&fOZay>ShD=6=12-A={BY68OlK*W1#;nIS#u&asfwg#iS5d#_mBe6M{?hA5j{D}IBdCO zd$M!uBngFnkO4p+L^Ie{zxDc26AsZ_wf*MQ54^c|Ky@e>EU0zohOrqG?q0qV0d(Rg z4hDujjC#QgS6qwl=6Ep#i0>-nbG5H$-tg1t#Imx>hTa7y_b@qJHe)c!WgdK#G5dM#aH9@}_M#&eH6W5f)zqun~4vz<<7?|=UDfA_!V{`dPIH_--XzD;b87yw|K zr3Ka&0EhrW0767yoP!Fy1V+UDq&XJww*a8Xl!X2izhfJ2mg_M zQ8=(O!ZhCPG|f}~Xpl-7`q98F$AsK4&m3je4J6`d&1K$vdNDW^W!BcvhpVqFlQ&if z>u+YB0=aV>c?0=?Vl;i_$s&@=R+sfCKL-lRhw(Cw*msTZtqrd%$1#uUC{!C{)kIC! zCtnb5Dlq0M)>rP7x)K1zh3GG?clVvW>;sE_UA@#sAQI@q3Ck1nhnjCXuqZPIbQlI$ z9Os0~HP&z7(9R$B=M}Qo)Ek>i>Q-B<+Q|^5ZCTdd^HGZo`XalVrAYzlcb+OnBH`p( zd6I*{V)tyu6aKWDtSPXVJl}N7g`P83=k7CgHUyPC!y14hfTg2Ruu&ANQZ>p*cgo$b zi3Hj_cWptAShRHz`(s_Fc==j2ybB^ zS^|TC%`>}9gZ4`T3dJO0yQw3MQ6w@Xl*^H>mQ7AhPRryy9F~;?zD4Nv%Pe?lzxO6Q zOOJ?3RW$Y&2S1{@XEJ%pjZn3uym{>wi&!CkiIZ33oOEx#K8gbbE*r_T9eM^NsYj52-aixRJz=R!*Saj9#jju9(i+& zcy$Axt{OS$UlOou&x%VXK^%xm14)3{`UWsprKCJco*J9&9N8H#KY?3RI{!S*=`j!x z=|7WyqwWI=(+yEeLM<6ubEL0?XD5Tfw!JY`YmW7MW6UFU_L=E`xG>IqsxieoND2cY z7Wx@fqED0&3N@0Iox1Afl|8^LvR8L1vS(3)CFkQi-y2R&O)l^zcFfV zm`9rI_pbK%+2)pXOr{|=NIiNkZnK-mqmc_dA9ZweELXg|ot1ShF;SG7vkbMNc{*oi za9ME;#Z=db2z|l4J}|zdqpN#sSzSpY;Sx!%wC)W#&>(#eHOE7!G;}G)C{q8S3!|c@ z=He1H6ttD4+$X&8<@+()-J}l~Ge(5Y*2!3`t(Kc~Ll*p6a~)hH7`s0eNTh`xL-4c7 z3B>~BiECyr)YX_!00m4aQ#lR@R0Al1Xdv()1o9bv185!5G2C6RmejzHG3>nC=PO6o zJC@dS@kmGSECRC%?@IG3mn*Vw*K7GJT)uJe*=HiKPmI0*u%;gbJ=|F_8VwiAbCy)(($1#Ttez#7f7c{3J2<_?T1yx}8GNBXRszwd*}=gOwRFTd(a<9YN-^ zh?$6Sg>SJ(M4uF-sM4B_v1#<01UoFE}&uo1|Dj!Y6Xr%~t;vZ{=vDT>y4#GN%`FA9~IQjzq i_wfIDz9*!X$ENV2n7FjYVJ|fxSeB+ZZ1D-#*uMeGa>8B! diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png b/src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png index bb88d9fb7c46a8703d11a18314b60dd28b24cca3..4574892d53bad8efb33b89ec96ef3665ac1311e8 100644 GIT binary patch literal 3475 zcmeH~X;4#F6vuCj5XT>5~zv=w7xJ3QV0+fgaTRAN{WK9 zI0Z{VVy%h`y9&4@v7k{A0a+AD14scO#DD>^Ji_Z^6SU6si#p?sA2P|kbMrsv{LXUU zi*=(q8X3$m000;{ZE)BG00#Yu0TcDmukCx%eFs*1H#x2WnGcC==wkeCdl!2Ea(I*a zyeFV*eZ~gQy#U}v10RfkO{_k;i3@ddS%;JAeLi*hl&rm;56~@>&~+Z6n}dBr!@c+T z0EYJuL7`SbKB2RhSS_?#9M_WM27qCglY{-1h#hi?%f;_Kjqh~nSsYfJ2y$`$;&QoJ z$RD5Cm;YiW*5EZ(nyqUNP&=mimA{B>*f0fWfG0*s;4N|qQ&!`pN=dP3yF%5G)b`h3 z$Pc@p-|Xc0G<=^eI3Dq9k~K7I2N#j6S{OFluUM8qlfQP1hIo@wm<8XlHI3nfG`9MA zXBUo8nN|0+K20tz+$uGjqb#O~WDuDka->8mI?G7W%1(V8za;906L|q`u4~$=m0sb? zV6C`>iiul!%{Q_>q@LcN6(V;u`YAidpO) zh}o;Y)#yrEu_F2!@sOH1=A6x3nnMOQyT2XDQm~uUjSvDDI%r%!{NnLZ_PlIFP#vOl zz56n!z+ZaW9ItQktqj~yS08U8^=05_x-ucsT*l+lRvN;JZ9@SZ83^FnF^=&Syr`WZ z)Wz$1j!ffPv-()ti%5Hc#$uPoWBXD?MS_umiHicRF<*#P7bB}Xg9*Y^mhN@Q()l=A&+XH=Hu%4` z=&_25#EyWdZ3(L7q_fjQz{1oT%+Iy#KTU>I2&++x(|5OBFy`WZF^da zmYCte*~tVEv$kIV?|G=QEL3_YSGW^77Op3^cW9KYKC)6@HV_m`w6jaw{qdq}ES z`HD2`LNcC%A3hq$21iXhY{_BviG{4@+PvK|q_Xp?5~cg~rTKxPyhe}`3uS62VM`IKe1NkH}HVWu-A#ev{54*Sm~^WeAuzYZ)N)2FaP+F`WS( z=4UN4#dD6TcHWCwiN%XFy*<7~nDQ>xg4*oeB8*MFKuSlwlk&_>dkt+sYu)4Djc}{Q zaL%rxlNek>G#rUK^8D?_>()TY7e?jwR}9;w)0PZ7Xd0d&oB;Vib(`5F!(rJwfpy#- z0U<*RGY$^>-L$?hJ4o8CYDDP_dTMl>>86rasT!?@H{xN+rQmOR>n9L_`9S2R`Kj7D z?rc)fh)K!5cHCASv*6ZnY$0{$Ngh3_M!i>7&#`FL^<2{t&rpH=V+BTiHhBf$mR2E# z+QV3IYPIb&p`1b*A#aS7C>4!!W<(-7nHuxEpV0kJ4SZDS zUIxzMG;@W6m-p-C?e|7`qn9@SwesdAzR@A*{r?UmB4Pc4B~@))JKazh4Va-h49pbt zk-&6tSVUdkRWvkH&?po1y;3f z8|u{$70f%}@jfI5co>CgPf;mDvklGM3=?DYMtM6~GMzTJj+=(%=QKZL?61g(3Xs7q z2~5Atd#l=x?KjSV{R3d%A*YYu!RxPiX;ojRf{&p)6o|s;IxkFkhz9-;9m$`j`9Ei literal 2182 zcmbtUdo&*6z2V01%eE5#fJl+-m<))y6hmn z0#uH0JM64Hh|pf|u(mQB-wA+GkB z3GB;au?Wn}@b_KPCQ(8u+vUMj^+bDDkmFE%>4adAHA*$67(Sg#4yd&4o#9VSowMoW zrn(9Zph>9=dR7%i>%s4DINn(eUzZR?aAp_8h)WU#D zU3`A=lDl~3UX`$iQR+M%q85n=`FOW%-?0b=w=Qh#;2He!PjO7SSYFvsWjImt=}zgd z!e*vCoDB{o>W}4_OBV#sl!X(VCIKNs8#V(;|C(mQ1L_AqMLp{?P+)kX4w-sn?9wq3^_9QxP9~4`b*zJPh=J!b2 zXrnA$^~8IQGU-*}E88ZNh;4}^fvhXjy4<>X=JA20VNWe*t;&Qs(L%rb#Hi|hISi-2 z{>qm$+^F?YkYkCWp0yX;qI$F{C*@@b4VtYN~sw&jg5v324nMKS+^O#I+&;d zwubdNb}|=s1y8J@7}wU;ni+0p&-?oMxra62>ERPyzNOK^(HCjv^77oMKAH|`cgOst zGWJY_J-cY|p3R`8n!_!37K^ptYEz~Rg)kpS2Z=+2IX6^%VYpT}fCEinw53EDXFAQS zjb0FjS(4|dcm@~yWp&FP!BpkLhnD{I2x`-lCt6y{g^ACw7z=>DoagCNA{%L)E#+LK zUE}llfe8j=TN|4kdQP1wP$ZV}r>8SM$L3=1?*kO$1I3-i9_GK*r96g%BB13iq*ngE1EMNAeW|mwP}WwT4~EweFk>w5p@vJl6K8w{6_RR|NP85o1ycZyJ*lm==~2076R_^k>M4pSjnU$F}fCRHm+xGa(-%LD!hBP1knHGZpr%30z!R#W1W z?>HA~PSn)f4h;?2vZnO^dbhvNT#GiTqi1@Eq>`Dqv`DSGW!Q>xiO zff-EZ9_78jwdc#1+GGM!!H^LWpa1Kl(v9a02zSv`WdRnjD?iaGP@F!iFp65o>g~a#h4W_^=-i)~i z;Fh~Q9B31Dvc~P{;!{sISpbvPGqi7i1P4f|kCCpc8`k51>rJ=dGvypV$ zwp$TJ|EW}o7*M$2gXV^9z{|i)^zuCH$~R@Q5QU^&r5u0V4HTPkNqN zwu9#Pa(@iU?S0@oJ;vJq73IM+);ya1PZ%Ed)hp=yBeszLy7zX+^oX+$nmf0EF%5!t zMO;vkTlMZ6!Y m`Mb#fo#4lZ{GF7P(=z1%a`$-PH69))hMTj8Q^h{QmHz>72bAOh diff --git a/src/main/resources/assets/techreborn/textures/gui/rollingmachine.png b/src/main/resources/assets/techreborn/textures/gui/rollingmachine.png index 60363c99cc2897c8a43384d18a9124fc8eb29d7a..1e770183f61987280f73fb00d4b7c39fe4a4ca61 100644 GIT binary patch delta 734 zcmZqVU(7$jiNB$tp}V{L=+UFcjvf2||Nq9o7fdYMZ%E{Bwq+J)N0{f z_We_0tne=es_(UAWO;Dxjuyi{OS|nqVn0o0sQ3`veO@dfzv1Jj)n9zG!zw-{?TumV z54|n;inU?$tk3xk40mP-Con#c|GZxR*;1DV>qeJ`k6{W-4gE*6AFp*_W8hw@B*0}L zw^Lhm!JZJ7`U4Z+vrX?S&(~vm@GcX8?h5B{YZF^CB@u-ku)V|d45`>gN6 zEYW#;W-!?NSSix*e80@~iUX(ZI1-|9y4y}_!QH+K+sfE0wj%x42wJz_f`G4DRkaBQ1KmxFV0cb}9!|ghb`^8HQ8Gh?6ZL79Eb7|GoYYZ`& z#k~5@a<#z#U8+x)XzMJ7p t2Fbz=lCv4kO!i=xpX|dfjfCaIeC>ITWboxGalK;z0#8>zmvv4FO#m`*BR2p5 delta 673 zcmZ3?-^f3~iH+ekZ+Cb1M(=k_>76>T*N%PQv`%bfT8 z`~I&V>(`r{y<9p+tnr+$vhDxZ)%A`33~?^^_ix|+j)|M0TwZ~ZMWCU!+?#=sMS{Cw z{kM-T|F%A4sH;Er&RV5`fysvP$JV!pa%wl$A3Dl9m%rd*=?CY7)b_*r?WY>oeCDPR(M7%gk=oe|9|#>}C-0?XE5`9)KPI5)Hd1&xzAM%8(2S zgAMQV?lM|b=ZXf;dv6ro9=3|{NABjZAKY)Zio!HNV-KQx!8?=f*S!o6NN_4Rm>q~_ zJz%5zU3M8$L*=7;%2)pW)Mt>t&vv-vcFB3JJj<}jg6x%(^V#LZ&(||dzQD4f_;Ps& P0}yz+`njxgN@xNAUAhb= From d5628ff93a9b7d42a02be9eb21b95d57313cd15e Mon Sep 17 00:00:00 2001 From: Gig Date: Fri, 17 Apr 2015 15:53:54 +0100 Subject: [PATCH 2/2] Added basic achievements --- src/main/java/techreborn/Core.java | 3 ++ .../achievement/AchievementMod.java | 32 +++++++++++++++++++ .../achievement/AchievementTriggerer.java | 30 +++++++++++++++++ .../achievement/ICraftAchievement.java | 12 +++++++ .../achievement/IPickupAchievement.java | 12 +++++++ .../achievement/TRAchievements.java | 30 +++++++++++++++++ .../java/techreborn/lib/AchievementNames.java | 7 ++++ 7 files changed, 126 insertions(+) create mode 100644 src/main/java/techreborn/achievement/AchievementMod.java create mode 100644 src/main/java/techreborn/achievement/AchievementTriggerer.java create mode 100644 src/main/java/techreborn/achievement/ICraftAchievement.java create mode 100644 src/main/java/techreborn/achievement/IPickupAchievement.java create mode 100644 src/main/java/techreborn/achievement/TRAchievements.java create mode 100644 src/main/java/techreborn/lib/AchievementNames.java diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 50b1d6c92..b44416806 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import techreborn.achievement.TRAchievements; import techreborn.client.GuiHandler; import techreborn.compat.CompatManager; import techreborn.config.ConfigTechReborn; @@ -51,6 +52,8 @@ public class Core { NetworkRegistry.INSTANCE.registerGuiHandler(INSTANCE, new GuiHandler()); //packets PacketHandler.setChannels(NetworkRegistry.INSTANCE.newChannel(ModInfo.MOD_ID + "_packets", new PacketHandler())); + //Achievements + TRAchievements.init(); LogHelper.info("Initialization Compleate"); } diff --git a/src/main/java/techreborn/achievement/AchievementMod.java b/src/main/java/techreborn/achievement/AchievementMod.java new file mode 100644 index 000000000..79d2093f5 --- /dev/null +++ b/src/main/java/techreborn/achievement/AchievementMod.java @@ -0,0 +1,32 @@ +package techreborn.achievement; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; + +public class AchievementMod extends Achievement{ + + public static List achievements = new ArrayList(); + + public AchievementMod(String name, int x, int y, ItemStack icon, Achievement parent) + { + super("achievement.techreborn:" + name, "TechReborn:" + name, x, y, icon, parent); + achievements.add(this); + registerStat(); + } + + public AchievementMod(String name, int x, int y, Item icon, Achievement parent) + { + this(name, x, y, new ItemStack(icon), parent); + } + + public AchievementMod(String name, int x, int y, Block icon, Achievement parent) + { + this(name, x, y, new ItemStack(icon), parent); + } + +} diff --git a/src/main/java/techreborn/achievement/AchievementTriggerer.java b/src/main/java/techreborn/achievement/AchievementTriggerer.java new file mode 100644 index 000000000..15db75f46 --- /dev/null +++ b/src/main/java/techreborn/achievement/AchievementTriggerer.java @@ -0,0 +1,30 @@ +package techreborn.achievement; + +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent; + +public class AchievementTriggerer { + + @SubscribeEvent + public void onItemPickedUp(ItemPickupEvent event) { + ItemStack stack = event.pickedUp.getEntityItem(); + if(stack != null && stack.getItem() instanceof IPickupAchievement) { + Achievement achievement = ((IPickupAchievement) stack.getItem()).getAchievementOnPickup(stack, event.player, event.pickedUp); + if(achievement != null) + event.player.addStat(achievement, 1); + } + } + + @SubscribeEvent + public void onItemCrafted(ItemCraftedEvent event) { + if(event.crafting != null && event.crafting.getItem() instanceof ICraftAchievement) { + Achievement achievement = ((ICraftAchievement) event.crafting.getItem()).getAchievementOnCraft(event.crafting, event.player, event.craftMatrix); + if(achievement != null) + event.player.addStat(achievement, 1); + } + } + +} diff --git a/src/main/java/techreborn/achievement/ICraftAchievement.java b/src/main/java/techreborn/achievement/ICraftAchievement.java new file mode 100644 index 000000000..e2a03ef04 --- /dev/null +++ b/src/main/java/techreborn/achievement/ICraftAchievement.java @@ -0,0 +1,12 @@ +package techreborn.achievement; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; + +public interface ICraftAchievement { + + public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix); + +} diff --git a/src/main/java/techreborn/achievement/IPickupAchievement.java b/src/main/java/techreborn/achievement/IPickupAchievement.java new file mode 100644 index 000000000..75cc7d719 --- /dev/null +++ b/src/main/java/techreborn/achievement/IPickupAchievement.java @@ -0,0 +1,12 @@ +package techreborn.achievement; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; + +public interface IPickupAchievement { + + public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item); + +} diff --git a/src/main/java/techreborn/achievement/TRAchievements.java b/src/main/java/techreborn/achievement/TRAchievements.java new file mode 100644 index 000000000..b3a095b06 --- /dev/null +++ b/src/main/java/techreborn/achievement/TRAchievements.java @@ -0,0 +1,30 @@ +package techreborn.achievement; + +import cpw.mods.fml.common.FMLCommonHandler; +import techreborn.init.ModBlocks; +import techreborn.lib.AchievementNames; +import techreborn.lib.ModInfo; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraftforge.common.AchievementPage; + +public class TRAchievements { + + public static AchievementPage techrebornPage; + public static int pageIndex; + + public static Achievement orePickUp; + + public static void init() + { + orePickUp = new AchievementMod(AchievementNames.ORE_PICKUP, 0, 0, new ItemStack(ModBlocks.ore,1, 0), null); + + pageIndex = AchievementPage.getAchievementPages().size(); + techrebornPage = new AchievementPage(ModInfo.MOD_NAME, AchievementMod.achievements.toArray(new Achievement[AchievementMod.achievements.size()])); + AchievementPage.registerAchievementPage(techrebornPage); + + FMLCommonHandler.instance().bus().register(new AchievementTriggerer()); + + } + +} diff --git a/src/main/java/techreborn/lib/AchievementNames.java b/src/main/java/techreborn/lib/AchievementNames.java new file mode 100644 index 000000000..3c7bbc55f --- /dev/null +++ b/src/main/java/techreborn/lib/AchievementNames.java @@ -0,0 +1,7 @@ +package techreborn.lib; + +public class AchievementNames +{ + public static final String ORE_PICKUP = "orePickup"; + +}