From f4d97dcd09eaa120ab412acdd7ed129db0677b86 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Sat, 12 Sep 2015 23:18:41 +0200 Subject: [PATCH] New: OpenComputers Conduits --- build.gradle | 5 +- gradle.properties | 1 + resources/assets/enderio/lang/en_US.lang | 2 + .../enderio/textures/blocks/ocConduit.png | Bin 0 -> 321 bytes .../enderio/textures/blocks/ocConduitAnim.png | Bin 0 -> 18082 bytes .../textures/blocks/ocConduitAnim.png.mcmeta | 5 + .../enderio/textures/blocks/ocConduitCore.png | Bin 0 -> 284 bytes .../textures/blocks/ocConduitCoreAnim.png | Bin 0 -> 721 bytes .../blocks/ocConduitCoreAnim.png.mcmeta | 5 + .../assets/enderio/textures/gui/widgetsv2.png | Bin 26066 -> 26672 bytes .../enderio/textures/items/itemOCConduit.png | Bin 0 -> 284 bytes .../java/crazypants/enderio/ClientProxy.java | 10 + src/main/java/crazypants/enderio/EnderIO.java | 3 + .../java/crazypants/enderio/ModObject.java | 1 + .../enderio/conduit/AbstractConduit.java | 195 +++--- .../enderio/conduit/BlockConduitBundle.java | 3 + .../enderio/conduit/ConduitDisplayMode.java | 26 +- .../enderio/conduit/ConduitRecipes.java | 14 +- .../enderio/conduit/ConduitUtil.java | 8 +- .../crazypants/enderio/conduit/IConduit.java | 6 + .../enderio/conduit/IConduitBundle.java | 10 +- .../enderio/conduit/TileConduitBundle.java | 80 ++- .../enderio/conduit/geom/Offset.java | 6 +- .../enderio/conduit/geom/Offsets.java | 15 +- .../conduit/gui/GuiExternalConnection.java | 2 + .../enderio/conduit/gui/OCSettings.java | 75 +++ .../enderio/conduit/gui/TabFactory.java | 3 + .../enderio/conduit/oc/IOCConduit.java | 26 + .../enderio/conduit/oc/ItemOCConduit.java | 43 ++ .../enderio/conduit/oc/OCConduit.java | 564 ++++++++++++++++++ .../enderio/conduit/oc/OCConduitNetwork.java | 89 +++ .../enderio/conduit/oc/OCConduitRenderer.java | 34 ++ .../crazypants/enderio/conduit/oc/OCUtil.java | 18 + .../enderio/conduit/packet/ConTypeEnum.java | 6 +- .../packet/PacketOCConduitSignalColor.java | 50 ++ .../render/DefaultConduitRenderer.java | 13 +- .../crazypants/enderio/config/Config.java | 6 + .../java/crazypants/enderio/gui/IconEIO.java | 11 +- .../enderio/item/ItemSoulVessel.java | 2 +- .../item/YetaWrenchOverlayRenderer.java | 44 +- 40 files changed, 1242 insertions(+), 139 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/ocConduit.png create mode 100644 resources/assets/enderio/textures/blocks/ocConduitAnim.png create mode 100644 resources/assets/enderio/textures/blocks/ocConduitAnim.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/ocConduitCore.png create mode 100644 resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png create mode 100644 resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/itemOCConduit.png create mode 100644 src/main/java/crazypants/enderio/conduit/gui/OCSettings.java create mode 100644 src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java create mode 100644 src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java create mode 100644 src/main/java/crazypants/enderio/conduit/oc/OCConduit.java create mode 100644 src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java create mode 100644 src/main/java/crazypants/enderio/conduit/oc/OCConduitRenderer.java create mode 100644 src/main/java/crazypants/enderio/conduit/oc/OCUtil.java create mode 100644 src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java diff --git a/build.gradle b/build.gradle index 87f38899..ceb245d0 100644 --- a/build.gradle +++ b/build.gradle @@ -52,6 +52,7 @@ repositories { maven { url = "http://dl.tsr.me/artifactory/libs-release-local" } maven { url = "http://maven.tterrag.com" } maven { url = "http://maven.ic2.player.to" } + maven { url = "http://maven.cil.li/" } } dependencies { @@ -70,7 +71,9 @@ dependencies { // WAILA ships really old CCC/CCL versions, so we force the new versions compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev" - compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev" + compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev" + + compile "li.cil.oc:OpenComputers:${opencomputers_version}:api" } sourceSets { diff --git a/gradle.properties b/gradle.properties index 6f3ddcbd..552d3baf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,7 @@ ae2_version=rv1-stable-1 endercore_version=1.7.10-0.2.0.31_beta ee3_version=1.7.10-0.3.507 forestry_version=forestry_1.7.10:3.6.2.19 +opencomputers_version=MC1.7.10-1.5.+ toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 92f1495d..a0ee1eeb 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -115,6 +115,8 @@ enderio.itemMEConduit.name=ME Conduit enderio.itemMEConduitDense.name=Dense ME Conduit enderio.itemMEConduit.channelsUsed={0,number} of {1,number} Channels +enderio.itemOCConduit.name=Network Conduit (OC) + //Entity entity.witherSkeleton.name=Wither Skeleton diff --git a/resources/assets/enderio/textures/blocks/ocConduit.png b/resources/assets/enderio/textures/blocks/ocConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..1b38b840ce7177f3c7d7579bfd39f7be0fa74c96 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBk#;9$_{Xb=~EvKq1Zo zkH}&M2DyVE%y>961f-57-O<;Pfnj4m_n$;oAYV7YC&aa+q@N8dgczr6Ee^a`)^ KpUXO@geCyC+j+VG literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/ocConduitAnim.png b/resources/assets/enderio/textures/blocks/ocConduitAnim.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2119a1d7a1c569d78f26b6525b3aca58873eb2 GIT binary patch literal 18082 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 B7_9&R literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/ocConduitAnim.png.mcmeta b/resources/assets/enderio/textures/blocks/ocConduitAnim.png.mcmeta new file mode 100644 index 00000000..6c97d51b --- /dev/null +++ b/resources/assets/enderio/textures/blocks/ocConduitAnim.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/ocConduitCore.png b/resources/assets/enderio/textures/blocks/ocConduitCore.png new file mode 100644 index 0000000000000000000000000000000000000000..ddd159dc14840c2d7b77699246f10b853a5b63b6 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBk#;9$_}~8Gnx%1BEyX zJR*x37~~FuFyrCO5Rf{SbVpxD28NCO+v0(Pmr?DGINquSm&bo{E5<~j;$-U%09hbJ?T^E zF+clx-K#@9*YxV98XwxCou{|LG+Oe^f;b`dtwOugf?v)RzR`P&_siYa-*-7IKP&&& XiShi8ihnbP0l+XkKxm{o@ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png b/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png new file mode 100644 index 0000000000000000000000000000000000000000..74c1443356450da1f1fa93cb14c02c19bc21a4ce GIT binary patch literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^3P9Yz!2~3qvi$J{QaUBB5hcz=sfi_-`FRQ!lvNA9*X?VIghE&{o8|m$L*g&M@ zQH%73b<;z?%W!XdtEdreA?D7Zy)8#Eulu&R>*Re>f;!Qzv$k(g((X&Ycl`X~kkd~u z9a+2XwZXfx-3C$Fhj-k6e>^aauiaT<^(w3C;Ah#BZ%W;a6zF{TuS3N0WvJ2RZEtsM z6Jd5#{C!$O?RU50B}VZN4r~&fm3pGgF6|Pf{}hamyxVJjIb-Tsr6WyhHYqM?CrW<= zT#mV;V9$J{FRt%w$IF;W84rC{N+>MqeE;g#8_CKC9aCHGYlgD#uwQiSm1y-XJ->Z+ z&wf{Z&RZth9XN58gpq-DvqaWh%i8~yF&FOi+_?DRtmoY)X#s1)RvYh`!5Oh}hUJUG zyP_Yse^^?I3HpdyVPoWiT>rSL966n_$~3hcX0Ok51qkfocy)R zrtS?@xHSKL`HVmb`&Z5T4Hnofu=7Z7xUrIdU99{boBO@{_SILIT7Gf7zL$0O@dw|3 z9r%6kw|@5R4Nt!RdQen){r-d@(5Ue zJ-GEX^FR9&DFoCspZ)dCr2fm-$KMV=xxjvI=g~uFlMO!qcg)X?NGkqo|6BS5nLBsp{`;Fd^PQQTlbmzr>~&W5T6^zjJx_vxp5`qYHW~l`a7*i@ znh^j%O8iO+pt?akoCp5BA|5DxwRF`fVbnL7$rxA3Ynh3ss6Ai4@c{rhd;j~8^uIST zCY~gBR@GGn0KTQtUfWRs0L~CCHC2;Kf~2yhPfY(_WUMiV9ZD(|K9Dk zmY++&6@@^~CJF*}yBD3;@+URpB?EA4A-g+apfg2SrWnzZi@;j=_tgM8 z;;Duz;|6X3;0qrU>Cz+Rbivxrl$oH0V38eoF%|K$3d@Y){2c&bTxsb(N&8NY<;ReJ zxy}c*DO14z$4&HR|J`Kc-h=tqssRvzTq84f5TU#BS3eu%noTDwS8$9Z#K-MD|IZ9S z=bf9xeS`=(8Szj;OZ3+N?=Q_9_x$%tPM(+@P#cy(?h2pq-&^@UR3q+7YJ9;0HYxtf zEJRlW0M=CW#Qh#k&sia252^-ks$~4%-p>Bdk-p@ycgGH;3Ze5@f&cp5|JnYJ2mW6k zV9t2m9qd=S%0dG8v$G=_-r)v2D?;-w0iOV-Sb3L$|Ha!>a3VbbbqDbF;uIbLS#C{; z@VBJ}_}=)hQ~rNOVcHKTf@{uy!8#uH>A#!*hc}hS35G0o@uT7POlV7q%*u(Vj>Y*#zZ)!5f>xl* zE?QcEnB5|ult<*E2l!ttjLfs_fv#*q^YLw0uC!P`hx?>Px>wr zb{e%N>(B^guFeO5lGTN_5W{`2&Fhn>16rFaTyIjHW?!>7wnNm7Fpx{T^zkHv<1Wtw z7aws^7e2inLBfmRkUy%uXcB5@B8M(p=3#nF-Fl@}8Yr;YwwFC6`&J4oP0Awsk<9jR ztx1p2Ep+<_xNXh$04xEi?uEKBX==EG;O~C_yfAPE@7b;agTMva4I|sJ0nqY562Rso z4ZzB{BX;wqQrR`Mz}M&~GIqG-kqe>zf+A_g)8>0P5)8{NxCelL6MtxH8^-@yV3e>; zz;F>=Rr)^R`90&$dY=p*(kB|8jz{?|4iBeIehRFZZjGOmpZt6YwTTR6fzVl@Asawy z#xGp|VvF_erUs-MHcfw-xf3LfM8j7tzl-Q?bS$rIKeJow3i2BvEJ1tBGHxmFBYquv zKpm8XKw1&X>H|#KiSv3eeuVk#cX7^ zfGVoMHnfw3)t}kA%9O)tb3kNhyWG#GTqNeh&X~XHI($m(J{&c2X6!WKRrhB_px7P% z?WsUP=gCkpTE2(Hp1pQqX!DKb#p@p$YK zAMKiRcxQ`;@xEn4sOwAe?<+^{XrIAvz0#ar4?NZBzJLnz#LVlpn7Uu1UgHE+o*+%% zKe1}}G`fT-r;dXB!2ZX1M!mWMwvFA&!T6pGbF0{cB6IA#Yj)Gn!5NfXNhZ@q^EQ=z z^(7A5Sr0sccMpsNfH|*WcC{$4$v>-&5D28GkqY1<^BxkBc&Nyn(07210@ZZ+;|vae zyHnJCdLoW(H(mA37oxQd)Bj6QxLfFB<;@Uv5pnZY(sLZQ-ODZq*($+DvQ55RFTb|k z6ZVD=zpFRvfd$kLw>CjUJZ|K0+IxpzchrlMjolb$X1SRk5GwlSX5`SLM2!(Na}y!d z+R?Nww2c7EJ{BE%WT@MGrg{5sFahsRjZ3l*(56y8{mnT45}9;Tt)t3FGWN&|5aG^! z-17h!YiHY@PRTRsD|IF4Zr0v2?!!QGhvG5kk`%RVV;hHnGV3Gc=dN~LmzxgJhv^k+ z;#Bp94@NZ{k__MWZNCU9S`QKWis)g(c$IFxo1yTz?E5wR?8xCv0MS0wXnEFQ>NJ<` zI)42YCcuG!a%I{ig|?y4r^OH%T6To|UI5RSGo`mG7pxGjGq1`Zp` zc{2YX?PY}8t=b?w{O8aHEE=|pAZUdBE-4sFJtYAg^Rq%J43IOk`0Fn{Z_ztni|tjv z2(tVNC%K|=ki#H>kJ*TJTKA-q!!)-;nyo(r#PuqeU#Mh-h4a7b$9LP%=UQxIMK30; zvc!B+Y(9F+d$eezgwjOkkN-+1`=@Lp??rHb*29VMf*MYr$vDj@p@sv{0jXyofgNwD zbqtusGJ_kpLiI-U#;+p9kVLd7_VWAYHW|QIc>kIH#D%3s_MF3BAsfll7P;DqfAL|a z8;hWpbEwAhHK;x=9@YLGsk^71tR6(cO^En>3<9casdbRd^a~$6pZJnGSg!r|mwQ0p z#@r}$)Vq-so0P33iAXEZy3O$snR+bNF)cQe2K%{Kaa(?xBXqCu-+8ppzxg2nbf(Pn zo_|a_*lWe6uA*Ipdz0@!1yC^DHlDQhWA0^7Z}Smj)sL!7I>40M>jpc;5a;n9?9cxsr{om~cJ5KIvGgSC zD$J(Rcr)~eHi_zmnMr^L$Ua}8`M&8_?C|7f>=%EUr;uMlwc3{k+i;H=k`sN5g@%N{ z4!UyNe&=z26}wx{Qt6Rg-i0gTqAAkVhvb6W->!Lv)_B*N_uLMsJHX_RP=A^m2H}0t zSHSX;B^MQGq?<^Bq-*hyuss+g9No!Fv#yj`vkl5eHLcW#jV>%y<9IV4Vbfic*iY%9 ze47F=i6pLahc46w^s3AuZNypi!`89g(w;-m}EgW7YHKwn}1 zc=#y*#dqWY#Fox~*jYX!FLvh46eEjA=U=b&RzrFhp(2!{?i4`m6k10lZg1j1K z-qeK3s9krk+-q6?@-|Ht39s7u6CdXKp@-mY zW6w9KEHd3_fk9$BVgoldxU<-QuCw3ysT7XQzX5$18@9>KZrSF3i(tm_LO(TA@Rus( zeW_y{=&&wTvYs5sj{w42GmhbBP;3#62FZVuxuNb)E2oQaIbG6oTRdEQrsrsf?_TCM zQ&qv}NZUvp5NL*R)~)uIW)*v~2>;+PEC@Kg(8;1JNwD6O9po)B6|(LABOpNg@6!u1 zo_ArMy5MM^ab}9Qhje+FcsY~nwy^duNEh$a9bE+XJG1*aVzkk7;ID=gvm*geYOfu) ztuj%s#p}7@fL+p)Tek@z1*%3OYzD`;v1Uj+{p}e}uix|+*oi`U0Y2eTA8!FkA-34h z#MNaplK@$sl%&OZnU3Zw75}Ue<1;<8R@>KnukD6*mdO=8xLMmwtg9(e=0R4eYOL)*=A)u|x2zlMT~}?+?!ti@(ouk1>@3IT+=`ByczF zxb!(IY^O-(*=}Q$?DZpxvl_+0uG7IKIPADQMSkAYB@C3*bnObnXFJt`4L`MuM4t*3 zL+Zxk(?r4EVkpC8B!2l+yM0#4-+}s7nd6;_r^fSiyL;cmQ=1++Jv6J z1etXD2Ww%f0s!yKrYIDTM7)Y;_hQMPn z5An!!HRs#nhb$^;XT6hZ-O)3BbC|U=e5F`-ue4vc0Hf-SWwi$`!Fu?-n&;qNc&#_319N|0Mfb zhM{YP_eja1?!_Ohl}1|Gmb4MlNvCk%d7WnBPOcr zrgVWYuHBf=VqXq=c7`q7viVnghnJ(?bYZYeglwA!Qi!AoH&a1}!Y{lJap^R8!ANiF zBJ^qiS1ADCLi?2RE&dwguS!!jyntyZ7wT=Q;J*}oN_efTZ6yhIESz`MR6;I4BHG5T zb$CY@$eMHbj(IcA03&K;y<0qX3;dyd9+i@odhI_96;!dxvJ>(pcyD3+vLfV>zZ6B| zC;>n6e;XGev!e3H=MJ+@P%rAPycofwf9n5TAUZ`q)*Qn_yoWWzz}wjVOJ8Nk6PXVE z4)2jL^9YDd2LX@WCj~^briD$0ti5|t78Uc>y#BTL`_Q&kaiojyYmoeH3#^A0?uvNL@&7+jRUIYl2nJ89SQao}R@`O3PUci(-C*15&3 z=wnO&N`^Or(G-_4LZA6k?{l;a#z1w4MgpNCv>-{(0g~R=8RWFn)T%J%S1xMlXP`Ay z|MgtNBUnO_UtY;+Qsjl;S+DHi_g)NRBs!PInOOl{IoSpk8b%G@^!M6YUR{K*d<;ad zZ5|K~J<6B2a}SS#xDoNn*QM6;-o5Y>MW8=YXZ5*~+=0r4sElHhl5#k2v_g2YT!+mM zo5^3lepQS{1arz(m88YCmz$xpfxTXR;x8o|n_! zeJnNx5^Y& zXt1SflY`7KcjVqRP1R>E>Djg>Q@LP#^TD^BW&jnpI@SDO=!2u&VQ-4#pR`4;?kqBj z%!4E*EzcgczYq>x-GZ@XO3u(hp;KQu$4PCgmxQkqhZOI5`$e@D!d9(s6?0idDvrD@9UP3qiJJj z6PpNMT=r~3$&Hw`a(wqbf)`r8%k*N_w9g%ssu6#F-8j7^WR4q_LtUeSK7GVsQQFkR zbtC(Jd8*RVC;A7&Xe_*A`NAtcF`%zME5ZFahlkaqk;zSJd7PWXn}Z$R%o_Uz;7CUQ z$9v{Bqw$=<)o#*^mNrwg6M>yLB{Qlln+J9&`20k$$ESYPr z?+O%nJ{Mp0iLg(G1R&;#RQpYz7f{RbA4(GNKE6EbruvvC1;Y{!UZ3O~LXfPMBY%dYECL$Ky0^z_QiG zYrC@2h@tfsMdIc{i*qV!{O%JA69yr_{^gP9&mN{1_*gOQ8}*L)Ja$$@=*T%{hg7RL zJbuUjSo>q2QqUWaR=mW(r}XcG9qSx5+iK{jz>=pmV!qe?*rb~*THB1}4`&$_Qm@;) zCku3u`32DR3)RDxEOJ#@ktb-kzFld~dc^VZw@L2&``L5L26} zM|BE}hFpP08Czxbm#5!i6wSc5e0?M8_C8iC8~li*X82L|jD}x$t(1PC=yunoEdMGf zrE4_n*p-X@K3$`<*z35ca_>lUXQPXDE0On#rys+fy)Kr)o&8%l34Kaa>M9a_kHWj) z9vg$#@D7dtD?9d5s5>Pi3Ye;2)cfbY--F>G-Y9#wjV7fP+>`EUF0~Cv`+C;#!0Pw1sTu{1(*k)0w4a6o> zNv3pVg#>=~BOE;~d68+)N~|Xz53&J}-bSe+yXPI2u~}bEr20X2s`Vt9sq=3r*aD$5 zwl;!lH2q(iC%e)lOQY}CYqRK7f6>ma&KGpT4i9ON@d@EtWF^@I{bd7GyAWO9pgH$P zEf6-OIBw&X*`fG;*WrKP&Fqqftf_8hpRTL0_6e-D-FqS{plVpos*Zrh+(_yMt%q+J zmKBGBj&SW%5p`7jOzq;iCW8*;2zUDe#qf&p?Zth+_EAr{9fT<8?Bb_ic0Hm7Of#?B zY`oL7^$&$moh*e`P0rlsE3v-$LCpo$qrto~O&Yvr5Bi*mY0?UJza5z>A3Ck;;2R(L z0S5V(-`+tiA+Np?CtXLMTJQ;uDlfr<-)6>@Ykjw3x=$5C$&Vy^H5i|t5N3e7fud+k z{OBuna?KdI*=Doz<#-JAhU%=tGp=vEz$SB?{FQ@3;9^n+C%gETedcEeo{{%;C%Q@t zYz6W@!=ba8`_kP$S9}eVM|4aPhtr*J79+!5-9sD-O~*6Z1<+mI8{$ugN<}518uxFc z1P4Df@w9_o(Dj_=XT)WcQz4Pa+N z%2k)usA5RCwbdgl0+{{QoqqkSHX%)n2p6gh1$Gb6bRU*oxdRchJbni{&VW7`wPpIQ zc6$X*3dGlDRdyqKu&)lN9$R<*2rTTYHLas@{}X-K2yU$4jJzps+OK{ACjRPEKCceZ z&ahm~W8S$s0T;|Cv_CYIf6vGGPJzkPh+}313rwNsr$5x?ftfBV991?9q6*G1Vw%im6 zDh~;>((<~s0yo*KqJ8L;dSLC=tOEwVjc>cX4toVEg)1i6o?xn}3_R8`NgHW;s0D@i zwW2U~>gEK`uam5KclkLk&SN;k%kPoH1CcdxWu^y(dd^f?mh)*H zb)V74%jPB(7BZ@>-J8r!g7cnfse;!7Ni54t^qZ#OgivJ1#gc2%bnGUV<==tz0I&9b znYlEBeiI(b#?q2qFDynq=k}?|i|6QoaveA<&sNpw1bb0s*_6e8OKi11f|y^pk5ek? zn2jFlthd;BEr5!tjPU|Y)m=v@br&gCvGa=lZ0cLIOqRfn_sY#B!0w)1fstVT;-@_C zqA!9SUfZk(=6B%U&k`9Z{n0^ZzkBFgj=vd7-VSxxVKj0UWE6<+>J$aM=nJM!gN358vn3O@mi3hii|KAna-XL^F`udM*8 zJhzDnC-DhIJ+8gfoa5G+B;y(w7{s4pNFlGgpv@HUYVW%-`>#4S1Cv*^Qqr`xv|Tz` z2fE9iK~K{_FDZ-g1r;OY(7?kNsgyTVMjwBHx=JWMYVi|uTRW{OUTg`!I-YzQ&n4j` zLF`n#2G`!qJUnmYt;F6do~?J1@ztYfOcEC6=dpB>=d?9Zi|ETZhCi|%J2e;Y7pPP` zt-~)4X0^LkwMDysI1pGGd#c|u|GlgRrf`KVFPH5y3l-~!UDF8b-x7M#%tlg%~QfK&2!c>V~NMJXpm)6EWV&+#kezz#ZU6qHuF9e2N z%V=!S55Jnt?D8os(1f#7hZREzN4QVDzOwg;z02N+CBop`=6>oA-<2R29^OLG7d7&u zHN#sGo&tzUX9m7G?6pfokCi4V#dIcIre-aMm3<Iq?6fQPpz*!42B~)>dYG3a1jcuxH2G&@=nQN-tV>@?Tm~v_oCYv?LujqPf>9;&N8yE<4>k zr97@A$ov%|8-!e(7bO36RGsI0rIhIS{sSEG)959cUW444bV1HNAS>n$UI}x9eEUsITzN z0Z&Z+#etjDKELTTnVjd0U)Ucn{TvV>3z~pSPQfh0!`midn#?`E;x0;2mR-X`#ZRVz zDemej*~cLVJwvu4nlFTI(*%ohT}{Qm$^lL)H-01{i1LpHHT()L)J9-wV#~1ovjA@r z2E2pf{MJ*xQDs&?)`c41LT;(0w!`@pkk75xj`SKV70OETHdIW$^A3MFB&S#en@VFw z{*ieoWsA`%o~NMAFmDN64Ju#KghFM5Hb!+~BaL2dA9s(?S`1}@D?hk- z@klO~)73rDJC_G13W$(S&1Qa+crozC0^r0gtjOkr*lYUmVHRY3;`OSs;NgZpN&76S z)8-qSt3~tsi2_+CPtWEB#pWp#*y~JrkSKOh81yp!^yl9Y-sxZyn0#>pe{7;D0q7WDUUx!#t^v_b{7rHaT@D1mUjSZlnhD zC@W*;2d6+;^8ZGph8NYZUaH{;4DQ)phq0kvR~BuqFw=9kD>_EXObyoqupdd^O^m@b zG1UbZ4KVa7c0ZL=p4w{VMYJDF>VNqoAE)F0*f~x^bG$2ZZ9P+BQIW^4AwuPpi;4-q z(!(h!A?M`H&vwJ9?w-chNVMO(j&GaVkbC?&M+B8mg{19iqQQCaqv&`3WhEv@+Ller zh5iddCEpC+ZLXa@m3dfTSu(_%G&)sPV2{?MjG6R9{utTue6hzy0~G;abniZXZD2HG z-sFb8I5ykYQd8k3vA^^3TpgV~98nLw1_WGL{W&t<(r@Z7Y?zj&Do~!#@=?EZd0y(e zzUSq&N)xOLKkp~@o|hKFJ-T=1PJJZs#`Bpn1LX3jcmYRj$WIaz3>ZU()WwzzPW_v>2QKhty(Tq*`{&^uS>y*XXpyI zXlijkYSFxNQE zK{xlPztn={8Y*RJ68({QrPy{cJ?LnSXQ8@Z1f$OG(?N~KxWo+1lyca-4S4&>OY@k&7c4Ja9jb&|zb5xN^4*jC9XFXA(ql9Lx)^L(a|QI<|nASWBQr!ZrVG13@?aFw4^0Clu5AV0evAwJfvu3cV(Wp=aIcdsz2B@yj<@uSrFB zFq_a$D>gmaJDZFIu%zxK0{F8j5**gb8P;yhJxYCtPNBvW-{plj!?;r0Im|KJ0X0Q=)^YHr(|ecH`$fk{MW#4>{y>JYGA!u@uAoBMSn4jn5V;08SFOUuuf151`u>eQJ;jgM zqBi)=$@?EcP#-6F1S>nIc-uO5@b9C{##8kSd>!ZBKNakMySjB`T4=+saHrUrY~^XGoycSu%*}U zbMCk6Pg)>Bq!{xt^R&i{7REFs~@pE?-HXt(6j;()YQ80 zxy5TZRrb4*p=8-{UEj2x{yMi@gcbu;eb_pW~!~8Wz~fcNwh*U?q*?M zn9Qz7XEBG__I@e|wSrhTL@X zv$vV6?pwV6G&qspg=*GpAy#QYxaO`Cve*K>Jl~V=lbV&ud~Xa=pa$PlL?=hYN2(c0 z1%q>=UT6HSF!54y=AnJc#!a1WrWN}WA5xiTx4qhl+wrc;Rl)3N^zSFk)|~(LlyAsC z8fRR0+5wj$HqX!s*nOH|9jI=}tCc7CEq~?T>Ri9E=$+1;tXM;NpiisI)cXzx9{K z7r`eNBqs}%p`XX3es1wNg*5{qS=2eMT%12QE_5EANDVQhD_Hh5S2Oi7K;9qzsf&`| z`eJ;f_<5Py;WOr#2hwsQVw_YkZb)gCFnAYzz3ZI-x)1FsPCjAnkh9K#dW<-dHnP^>~sjj6?VBn z(V+fd*}TERw9DoV#BnUgKC3tR1_pSQ$bRb-zp-F;E6Mu>GwuyJbK)Hm74SC?aUknR zl9g>1Ms0$>kGb0vbyQBOLaqNsmzSUm56Q8M2`*s2`U|Q$#9dT4ezBFpTCHoL&mEuB z{VZX`4hNAAOv6}$3Ak==?%DhV1+{%!I)wmvvSMG|ZH5i8L6rpOiU;XivKDmD76e%S zL+3k+!2Nqt3~z5m4wKEQi3f0Wj?T0A5_)~cBRG^f|2?>Qyy*PmtV7VNG3|bv9csGQ zP?GnCwm+`{KGG82z zGanv4=%%bW5ojMtliO*!N3rC`WZtYv@K@UhZ-hX_JTp~SkyDM%4Xb4C8{7{YMItQU z4j(tAj`amVv(NsH%~5)SIahYA+(ja4!h``4{%P|kA5JTUM&8VaWU{z3ebwXDW_tB- z^sVRxRzSOMkEMUk;-+A(U~s~f1QgWG|B>3xENuNzRfWgGY22B&Td7wDRTk!DiHYV= zpS}F%oVIOu@agsXEmN?BhYtm>iRkXl z@f+;1X=Ts%b!saT3lO^cE1?SuY&5<8@}2ey^%Y+}Igvcx^ z65UV|27YbqHMqtme`fBcBn~XRUUR1A%-ejAfZY;t!TU3nd^aMo*3%z8M8$lWjg+dHMcb!JOJcS={h`rf3tGbj5%WBVaZw@ySsmO4A)aSMWk3)!>*X@ zBl1j7B)buR;pYrm-PaFZzM=war0G5v4(@ngcjSZFEBcx8yw7l3!uLs&jf;{{Mb;14 zByj&Msno0EDXTF;ll1y!w59Q{Vl_ec@PID`CMaVbotvdx_>=g|o1`)^@PG2{qsHNf zCl{}7u?AdOD|)0FhpVRE_sI}6-9L0tgWt^l@SxoWtanf`O(t!&QlSBz@^s$vIi!F2 z`$cg&J~``}?9`iYv;lo4b8Sevb3nQh00YL50!p5|Zs-a|eE>f&ZXXqEp4pESuyK;J zP|40N>F@AeR5rtgGB5g%KB`*qv-hMjGPkj*=q%<LZO8eo8kB~iiM0`!;F&b?4+*Y zm`8d~9g^>eYW_k+?M}!J!)2Z^#X*T|ZhOnzr3Kv#AB1Xg;o(o(u>Hk$L$V&qE|=-D z%?icu)kN1OXNNIT_GP=~7)E2R-Nd+0YgL?eqn7bIBj1cfUZ>0*GL&mFs!ESc z5elt&)W96)SJFbI*qkf}|DtRqmTuS#!vb-YqV7#(nqR~UEiPLO516kXh#%0-n(ldt z8k*+{wuUPs;c7X79^a3G^Dm;f>HeB7xkqv+v#&j|FZZ_c7&FgtuXwNSJ0Dni$cZbh9fxZu z-{CxScIVAQqZJyrrEt-P+gOGl8lfG{5Pz0xhQ%N6Gw(0$^rZQj$pRnMnadiQe66}f zK8}O`QIj8AS;xjDE^a7sQkQ>pdUtpJEBXc2 z{Q`_txCZ(yK2fcoG=p1r+E`IM;p|z)l}Tf8a1I%)?a=07@bMVb@tE`uk3PQj@9U|I zzRqF|`*ZZXPc70n+_JY&RK-%6ZPTCSvg5XUR;1zoupa1tzIjxp3z}lwL@)e|g$9oF zfP`x4P9kA8UK$SzKf)$YatJ-K5E7!sk#`YJyXSA@W`ch^o+mkZg*U=x1LR zLG&BaBSdjKlC(cL%!Ld8VcM{G2tJDCHKw2T#xggNO*D6h1mL*`Q>90*HKcFC4TvTZ0zZ)h zetmR)8p8A8(VSoETrgg#kb(Nk`yyv~1cWs`BKP8&qy%@#NywzU@pUB}H)Sw_^reqn zWFryG!rT^nLL{M;u)BOUpSeTVb-TlF)wP>wIhdOS6PU6b8<)3C~2_j#PTH{5I`oTtdR@-0A3YV1r@ zpz2L}gi}b-ENUN`FF93%wymL$*rhAfkz{5-9)g;HguG+Ipryx8Z0#;Y0Mv4*+~Hj* zE^L0+7o4g=nn)kL*A*rLxB*a!B{rR_((zKYE(@lU4Xbu_MdQq0K-mEe$m_8YHxu3x zONB{)Shy@tiDi-U_|46}g$5I)VUPN2?{t8*2n+R>ltvig;K#Hsl_RJkviM{+= z8~XJC>mGM)F=4$A9FM_zP+EHc{>mv4q?>|tN4S2;^qeNg6;v6`>&Q)Jevs2|fUdgt z1W&nkNw@tl!S9+Ec&zoDT3`$9Ri|oxSYjSPz99!@K|V_y0ON4plEYho2n(-dKmt`e zGdanJ%ACjNW@uR%<1oJ6#u$xYd_xz(EQ-W{Z%4u3+O|Qn0SjfLuFlRqz<|aUtEH>T zY%uporV=hktLC;g(_vN^BTAJCQxCmg9}8&#C61ryOWJp$NtRR#km)CLo1Q_(lljD*y7sx zFyZaC45xd5Sc$Rwep}f_b((AM(<2t=cWw8*P#UDQ*{Sq^!k1uXI^v1YYsRyl2$hgb*VPjy(RUE)HyNdQw+ z*PkLLeK{d?egHt;&2*w(SnWiE+vycw&weB0Bt+u+rHb%2BQ+pGFNzAFlH|!l)O#L( zJ?u_13&ATTCz6kw5OV@xiR?eA@&CO=yrISo0u00jibK8CWhEg59Kv}Ayz|**{^x%C z&pylo$r3fuYXFt>HVE!`et5*G#b35~a`|bY9_UA>%{~Irc6@Tu>^3wsq3X@GGk;baCUtvAMlzNF;oNF8}Mb=5-vi<`OO-IZib7uodpIr+md&+&x;PTu4pu z9UAHb=_s-Ee1=<|t=ET+SOspxUi36|{LA|-h21H~<>jqov#N?Y!1y&7ZmpH=k&6lM zdK9fl^DcG`-2?jK1PT3NYm6Y2MBo1ICc&C$=-3{Buvz|45%Ch>D{+tbwr@o`wi#T1 z6a@Xt^?#F`*VEIJ;pj#bE=rNExA^Q%WSlWl?{SC$YPbIy>lc2f^CZ?TS~gR$%$jjU zgwwNsIrZUaFX5vredYFV+e)H}N><9s$njJTDqA+P{VZz&ET7YD*k^zL&w~GH@#n01 zSde!3ld632J#E>OqpD?5!;vthxr<}voqc0O6INP?!Siw>-n`RR*Sq$3Iea?F#-!Ro znVaNKxhU2T`%yF4W~`-w{$|9}mVe`t*ojWezx1m~a)5#Si)oYZOAV*fsbPOx*+>Gf zB=x=>$K7K82oBj5S^mI9cweXAc1%X6@OJq))xCu%-NRZeU&)e9g|WE<3jE=-@1ATe zhhKwP-70H#l?&r-_rqTO9EB{>e=_Il{#z72cRh7xdp8I%J)FDSrVs9a3PrOBUo)0ak|DA4{0@!u-h#E(#C z-Xx;)Q(@JsZPnk>6e)DP+>{l}LoykTKch8%q93p#8jcyO-8NlnYtpIudyq`d;WI9N z(f(g4mT%|}`PE<#eK0;3%G;?h0+P z4v2S~Yf;8uZn@>ZiX8;L{kU*}#}d0{Eu&uZv9?WUiW^t(-os^^pq*^Nz1!t>HzI=Z zL&YuQB6J$m+~Hkz0bqoe*;GAMjQ572=EBzBE!&l4BL03cS>5=!#%lVdBG|I^t z(w!UKXEyOR%bZWyiqL+-phaEV<>tz-px!C`%4^p&p$UoP?|dIeYW2ACgrTK@gE`<7dU{vQ+=c<9~%>#%x<@9vA9a#$H72 zD#9Ag-)ZoWEbTUFH24R+=Y2bn$lMA%FxLBVycz&=vs54q8hgm7z4^~)JCkx!7RGGU zQ^%Uh&XKFNMX)`Cy;DW+7YhP!JT3@{kyDKKMb&l$=f0{t7|ntsa&nk-!*;ulOeFn^cWEW&n9LvqJFb=j!NYg z`c1WS$WL!4Z{8AX&cLdj2U4WOArW9u{})~FtT-k@I8!FHxc$5xae;B=eXAgWh|LtOE>I48OR&Ukg#Mam1C(!v9srn}begve4^#`2bAnQS8_GZIb6#VzP~Y#3+!kVl!(S)V_2b)RvuYRb;5{(a z+}5II7L-wy5EGr55+P}`_|)@Vp30jF5uuFs;3g+u{vF&VvyqV*k&KSufR)|4H9OqT zdmPIik+i8LnA{x^GwFYng5E7a+uw9gXsM}r9(*Gf@~nBvZ;crlj}?#LZ1RNMqWjFj z5_MidR*jY0pFg&0mYwXuoo%ZuX1Nt)@7q!REJWm3X43O+n{`uWUS@?l{-NwGtDK}$ z!9;N?FvHwmvZ|FO@yoQGmeT!ydov&cu$V*;{WUR?ISo9bUMR3g^w zke(N^9JRieygn*5S)-|C(#EBQO**pqYuz7wRgwA5Kp)FVt1o<1f{crosdOO>ZVcK~eCr3RE+*V`S{)l;9a=+v7?9HY{Wj);$eLaxpk-u}S zNU+;;o~$+aZH##ZAfDvZ$Sk1i5; z>}?g)=Cw;_qL-(K5Z8_<);${7uXKXIYR5o{_na}2K|y?py`3AyA{W=pj^y@*bK*EF zRdxh77^)-%!Zfwh=sBTsArG9WJB~}-Y9jSydEYhT4jo`d!&AEOc)1@25c5WTD3kHf zPTc1`r;QFFtf|ptcigQ>8|w{j5wrPR5k}DNhD6=YaAgm!F2-JcR*$}|s=O?1IsP_th#_XM}~TeHGBaiRut zF86e3_Rfxti&d)**3yB(ab<;pEt-3+E|>b7C`G&o70q|nN&-bT^`0@xj^*xY(OoDo zrz=^KyH90$_)xAKFZR#wa%alT4^?4ERDLPRHRO$O$X%A7fdjObU< zhQ*bFmv8c_X-GUgq*Q9=(3f)%P?TODFj?jrG&BpxP}{kO&<0qOHVI){?q`XtrNYWq z4=mt2HDsc4-@Pl=Tk6p3wPC%cQ>^cqdpb6S{WbsVB&_wytAVI|gM*nd%b`r&OpCIf z3aPb3w57}QQ7-o0z8!ctgn;}T>!c-{qB)VfJ(wzx!xZnU0Rn@BmGS5DjqnR zqPswYfq`welK)8s<8%l*_fek1Wg;g9duph(si5;hbQL_L zr6`wrS}S48V~FVP)u8|!wR*G4EhPvQ4E7@tL`M?PB{x13OU7;%&OJ^{z-AFT7eeW4 zz4nTz#|^>w*v_pVm3P37yXM+ltjhw91#W%3^-psH^WRf`3tk*GsSd6v2+uknDH*%( z=A^nf-I4CP#+z*4eS1GqMAyCSO({~ytis-^bWt%k{hx?;)y+$Wuq!Jsl&?v;oruQw z9-eOBa{I@_9C%FL(ZC2%ij&8iN9#_#`6(y(c2h198GOMg8@lJ!vRNoitqgb_A{JtB zy$gVEKLc3Z6e;0})+9KBh06fAv4)=qA+7>`52~!GGiFifYn#^jo!(xr00WW#U3bo3 z{3;8{?ih(+mdKTep~^lPkF4hLKsrtIr7r%Q|KMMGL@d{L2~*K&MACsh>9L&2*pX{E zu+E~Dop)r*PDu8pus?cPXXsoPhEccSp21RgCA^qDy22>i^?Df={KXyBBKm%G=8aZb zN&q|7JLcAT_%^M3fz(~l&;QUxBqvFXjkzou)Ya(?Uo8duw`#MT(FZqyy+HNb8S@og zIM!7I>dn3-p4hVjZWn%ScFo=HMa9(}axX2Txop)8jtQRkLMWH;s^VN$th%YSn;;=t01m{Y2C-l6#10^M`Au z_^GIqvPK)g7hcmTGzr2|D4sSL|H;OP=Y1&At*2v$fKb))KaD?80^j0YW$X>ATMEts zjWn-&H`h7Ho}5zU#}Ki8fL#<{O)kamn6$SZ82Fr4pBrZu2O5#mJ9qFvx2HqVhBM*PeDJVOY?xyL|&{BE+TkJA?5{X%7O58eSMy7-bQ7ZE;Dk~_Kt*wz?9%=Thp?F?)nJ>MCE6oKCQdB4#7jOD+FRJ%*!FbT_lbcFIQlF99!-4h zK6v&!@}-foY5feu_ZWf0OfY$ve=B;C_10W}eO}Qz1#Zgdbn>V_S@p??EuNq;w_tc$ zWm?*V@Hh>AD{;GNt(wWgFFEdoIf#C$Rp=#9IP+72D8fBwQ{c*RFIVM_W7d%MswB!; zBZ%U^c;T3_x^$1tIw_L(!Owfflpa;(I!o+Kc0ozBv9UX?$Zj{q0lBB(;wtl1mBcF> z+YS~rW7{m%q->3p366KIWFh@>c@RZea0KQt4y2p)1E<}U(HK)4O($sNkoQu8l?sqy z_&6Ya^(M_;M+!vO1@hKZJr9cVz$;-aQ z&C4Z0(IlObV3PKDr$YP=$k&)_%;#7G(dd@-e{3EnFOY{N1A|jRdrRJ0@Ga9$u8N}f z>A3k)+-~Awd(QLNG*vwCBm@%ms+z6uP(nQ8VmAK3=Z0+d^IxEF-@b-Cftag(yb5Y% z-4=LnFX`O!HFV!EMA@BR(v2;Ig4vocURTa&GpM((Z(XcqA^J%}-LkYm zaI&)}KNV($Rq@|^@E$a|D&UEZqP`R93ag@OIK|sF4w4Z%8eY~_2I_kmwwpVy ziWhChN3D#!*Ib2Y|786E%XX)U-Q z{zvJC-Z7pPx$r3%Zv_!WNWD$<9R2Yq4-Ur1BX4Wr-%2)IKcSHsaXtiMbYR_Q{{OFv z-D_Tu?2{^^YuXenereqJ@*or_wyT_q?hO<`DmH@6F<^Vl`&aLz!{*DHZO@wS*Y$X( zzT+zWi{53QgT}(?bXSf6Px9f~=itL!4R&o&A-U(8U@n{}>7se2RnH&5vC7rOI5GXR z{9jfFr?Du7_(!N@SY(M(>o%zs&|rE~{~tNuT)ATuh%SFhM1#KW{)mW(x970nkx#k7 zlnlBCY2Q2hX(G7*jPwHwMF<+OyzkU^qWF$JjSr9HR$34uByU2kwN$pJH-vanW^B+w zkD%dq?zD-?@^UGs$jn`pu7vBI%UpXq5gS;&id#oK9R+o4aY!rTC`2y-0f@U00zD(? z!%e5B@|F|Sz*8gptY4edqAB2xN2CP6emwMSMXp*%b6FH0Q>xq8gSIQqV7n&QjT5c; z9q}J0C2Znt*q_3iZOHvix3NA^B<qdTEx*7 za}YQ_G$#mBRfhkWEx1qDqj^z&OD0Sxr8Nt7iV?`FpZiz2AQm)PQa#M5SsQ!4Z9yEQ zsDficK|K5AkL8=pEy*9)u6#3zq^d1+sel}@TU=ZeI$RU!X?tzGwE zUyMT+uJo5je_=WkPJR}&3oMM1*lt;p(AF0ryY{L_7H)+N~|e*Q0`Wl0DRdd8IoLeU**frugRM% znqMx?#AZEul@iHV+UCUudMQB(aWeg+Yr4G?t}A}COeBGEU4A$X>&#URXE=fHSVgl` z6H=9^JXlH8M{!gz-PX&o^i=Zl3+Tb0Jd0iD*J!YU7Ba6(Xb|w4>cJ8gOsYY0NAyQZ zbHePugQ~_U$lrF^@}Y>K_0~BaL?=T?Y0E7>`e9|?q6Dvb+9hpi@N$e6Y|n}}N4&xO z1fhU>vJ0Cbx|T?3V+NZpIYLn|r19$y?xf{}bC560No=x}g>)9TvS27$R#tXf?%2&E zqyVSfJC-Nj_8N2ldX-2ghve$pnJhKF5?xqFuvp9!Ha2!zDTGb<<^A>qX|+JNf)zp>v1fd;wYPJrfDiOKks|Gqg^QK4 z4MbMD>?9key_DPJ;R(yuMb(-C!M?}LyZTPO2g$E(x8`>h>j@RWL}~|WRIsAcfwG#Xr6QUdK2W3Y_(69 zO1fC5?OMvWS3fL!Ojir-v<=UvckJsIri#JLz5DyqHS@Y2OCrH?(OTj<@#nMSf(J07 z79d*g(lw;jhA_AK?QKCCP@gzlWK5?rBc}B*&ME7LE2e_his|btoK|w*_1zJyb=pwhen}#JQ(l!-T{yA_!{QXg%3QH- zwt`rMzvUz$1MHE#egIC>Qk4~y=9uzDvvE}MLykq+SI%BR?=^K;UEqTO-}mgQlV1@u zDCEjjyeSb8LAc&_MJ!h=wU}D{vq>jv-b*z-m=TU(@ldh@X z`pii_Qr~;NM$^bXX+ny`g;Q{?AH#}l{7)oTgfDw*UA{-MwvzfP`Y~lx(xyQ^C2Xye z-?3xghmA$~R321$gT3l4{M(&XmyspW!Fs!B%SivJ2dZ@wv$#4z77JH5$&(-ACT+5o zo=c$>+i&SMJ0^7BjtK^>$NgplS3<-zD+$IFhX%-)3;PE0QgaPlc4{o-V^zL;&yXJF ziuBb8E>ALuZE0qRjs{HIhBSCYX0USZd+I-?dUT1@9dGkv5Wglx2n~?%2L8dJ%;`s^ zQov*cnBqNf$gq!-Tws!a4|b5DqY`*it_xi4dp35|rzI5cSJ!T{OJ#OE<5lqQXAmR! zM<)%4g1C|&j5c!4vvN1KCVE|+E#ED2+_%KAQidd1{^y5r1BvKa?~O&Wt3P26 zt!6HwCW!yYi)J*p0dq{G%0jjJp`3>+JuyRE94%&#-p`^=8*@DU62rkCVaB;U`*$-s zf%_{qw{JXjj{5d&wH>P#UE%TbrnodoE@ ziKf_CFG-VHT3cj8lKSO&#HUNp5UfMi+L1NoX6LP9@VfiT#1yhh$NXH1Dm37-o+f{O4(Bp3%{MfLH zVx66f;sW;h9a6`zfy2}#X5k7AbE9)lU_X&Kq(cO)o#OO9%OWxD^L^|%f(4}Rtf9z` zzCLnSahm+XBt@6GI;_84n|y>4atf&(4P+v~IcRuNvx%jmaE9{0s?_>_hzDUMUpFN{ zm&{}P2*{HHtqEuU!Md>FVFNQ06Swz`7nYFs@ueVDu<^FfCgj)8Om6hS6pD`xJfIP# zWNc>K2U`*D0F{lb&JNk2c!UTV>-aqhrfoRTQ6JVnn0bs=-54$Kdt*?v>4#m-A+%Me zRQA_{;ZzWSfkL+ZaN70+#n0(+c^+WW|Ae|`BiaWprHG<5%Rn__~rXl zjM#ZRSylX1`<2yr8#MKR`5U59u$7WY$Uz8!!Nvwz9INN?yF`5saQx!pMs*=;80ShH z7F)+O6ov&!mf#`o&)G}Zj|SLpV*HV#i*wajEjO{iVHkm7rOI~)^e+>pl8EJc39CGw z&wm4NT0q*kY`vr=!UyJRJ4G9|i;h{FO=ur@n&DLaBdO$;gh=&AmJ6)#qNKd6`{a&$ zYUs_7{+F7xz*PB)G#IR`R{}Q`Dl6TEEv94f-GR`#eDX0rLzQorQiu=lwtXymTw)+? zA;1VfTrR$HZnO8H}C+c;J#Cl`IEkc4{R8Yjc&gu-@O9o`qkE`8O;lF^Bx)RHxJPeZ*7_O*MKYhQ0H z!V)HutIyj`7m|@7qIf5dl@#-FVu+ZZgR1pyX6dRJP7HaE0DbTz(T+dtwK4SzAfh3R z3yP{*%?Mo>ftxbplmOpqUFY(@xaH{%ZNr6rhu^&Th|wCiQJh#D&E?1HL|9s8h2?Wl zA(L_H&6%t1KIbiv1$kl#BByB_V3$yKQmEm-PH6cfQ`r?&2+qsWBhH$u^GxrF`% z>2F~Z35)M^J@~i~$_BM@Ve8Ea)lSspa8apvu23y*Hvu0s3n;nZT1=uz@K`+6J^LHCa!pSI0f#2emYd7q6U5q)jm-)@ zuVgebIXM@W{_fK=TY3=#wITtr++`hp4jfoU1%2X3Ixny)PtfgNVi&3Gl53m#Wz2IH zIcd0KQqCzrd>k)bS2AFz&I?~kfoh*}E^AYiQbl%hzG0+xLB77WIQl4R(Jnx^cwO>) zAtIDdJqIA#xx?DV2({K3uPDdIEIry*~4AoY3_HS%|!l9;m{BIes0C=+@7tR2fUCjt7Ed}&=RYE z0HiY7dryJrekMY;#c0S;>%8>!A~2`Hr^hdoWl4^sVjc}Pc(;du>L>@E^fRzun@yXU zLe+PJ@^U`@NKKuSC=;+ggQq41bMtbI+pF(_)Ua>aANYFt+vVmlje7?gA3v+Z3~JU4 z@?TF8XJar_0$1b&)7kR$uFT$}YGZT9+sG6wx7_shKp*vtbT`A8Wt94eXXFY8 zI-^OM4}X{kH&Cf=z_}tN`yxf<`=hsb6w%HaciQ1W!_`yO}RGp3$`2E4@=97-fcxVbP0c1waPsK)Ci(rt9ts? z_u$c!QOx&#`B5(`t&%HRvX-wgSz<6ZUU+kVKtuK+rk?O8<&mSZF=^`j~vwDGyh5opGJ{4|NV4; zZxa;Azm?Z2dDRxPF!iz8%oiZ2N=7fwZ-e%!Myy$O5e-~aYMVX?0VvJ;Yey zaP&64EM8F9gK=*EN}E`a@UcNR%>cUfP6{xM!O@*t9zvJ+RRAnkDhZ-#C|z||4qd;e zT7F^JA6umX)}4K=?1J@(^&7H-PhRvF+Br#`cACDR-skX`Q`ppX=DHP$E;BQOhC*|6 zYBH^k1eqNQn@D=S1jE)&#Xr86=`Zt|W0${&CO^MS7{iRq6IR(>VgK2etFy-%s!L*1 zuvYc)jT!Q0r*UH)B;05>K6E@ma7FGY3`4lNYmA(?-aWpd#%aX{`snU~ay7*{M>ce%8Yj9SqXD ziz@87V(wK696$SXQT2Y^W2t$f@0{V5h&mhdrP^2U*|kq55@L%W$c;iKr|~V0CWiUU z?|2IG7XnO7^ja38rEAI>8~M8wJ7Q#zXxg|#;mT)J+G<7r&co8(cl#l?iHzg;;(wp2 zxk~O(2>Ev9@L>DD=Nllm#qp@>vqAWYk~iJ~*jtjTPBHYvt_Xp_JO_7G{x5w+#nt;PUz$n-t$Z4QAJ(_1??s{YIg8@?@46h{B6|n87atvz?+hqWGwvPPv&&pMZu)D0Q9fO+Xb1d zi?){%m44H5e#9Q;Zq$57;20F~2ckks(G;F@{3#fu+*0=M(8T`PKl6q2k#HyCU_6@6 z<9{T!hHx61=LK$%Qh1k9rAB_7AeOxJ`9_IIs?9kpA~Vb2`E&Ot88&WzKZCMTTMuOd z0&mj_hOE7)h>)W~+H$^JTjKV{RQf2k zir+U|3A0beHeh8SHCwM0_dcHXeC&9_3Q3@=mh@LNy%z<%WED>R#D1hR3q8?8W|NH> z5W?o`oT0GMR$mA{2NVEe>sWY&uf<3;`@e#yFp4f`o8Ht?xFKf!&cBw|EK2{m^X&fs Dkpi^4 literal 26066 zcmeEuX*65!_it1Ut*TC{rKMU_jjbY-O7&Yb6g7mJLceW{MNu<}YPChthEQYFSVKgO zC6eewQ9}_iG}4+)u!Q&0Tl>*Sarm);e(#&pPLM_IdX3`Ru(Df7`-D zbid?&5C|j+y?MhL1lj|f?g0r40)N)R2Dd?=Ga%>Iojn znE&bjO6sXx-{C{TNp7Jc4N1BYCkhHrYkmr->s}rnmiTDa7`^?jyP936&A+Up?>!Ks z`nl`Jy~2<}{@47kUnvO29eVoe)fYLrk&%w^NSB%7^6?Fh6?-tEVkpN4&m`ek9xq?k zGjg;TdKE*aMAm8x_&f;I^YUR2a_U%KKlVs>OZ)V`KgbB%cp>^8^l%ByjxSeWm&LGNQn7jURaH`}^tt@T=;R zCo@2xhXxTF1bX*Y>fgEjUGR;G9ZvHr;8V^ksb8p5kQ8os(YC& zmm|1;$N&G=|5FlZRcIRXBd9(+8M8VTie!YEqLG`=QNsaRpqtj8SQ3ax9P_FfE}js-@nM1=uTQ-m#VC}4b<8pJqwGq7k;bT z%3a9uK}N8$+hzCaGP1C=4S8t)6{M!*1?Ul7hHZMWT>Q!f-YpD@9=)OK#}8UBRDm8* zRZ;n-Tl)LqyC0r|KW{GxN?yMc`lLSlJ<+{A*uT$(2)7Ih3JUD;^74ZA=ysNJF54M^ z=I!H+{uz%HH=O;JXM0 zm+JS*LxBlg317K?G#Y~#xpDvfrm>WX4UM6)UDLZX?t?^m4dJFEzTAu27F0@{@PNx3lUeRRU|<(^pgzu8&8u zcXorpA;1bh97tTlRr;MfgY*`Dj9BMrPx&tc|Cp{Pfl7=Pq>a=`{4`c zZL)j{>!LZ0C%`u>g1Mk-ycEd1SjOb8tY;N7yp%dNM1`mZX)&WfZseO2 zk9?y3d4%qF_|ad-_~#vW6}do{^?X%g>i%+Qu_V%I_uF^{I8)IKUCwtG5rMbuzn-Op zBYOxN$~M3EfSz@Qgyt_^ANJmoeOj_7g^^Y2Rjz5yzD$4Zy)4i;+q&xd7PX#LztN6C zG-`}nY%!7Qx%+WDqjd=(def0CE$I|0(T^d{qbB{DoQ)3HOBz|3Jh^9?-B>fAN$E&E zpMBt|=&5-)Pt)9q?&G)xs`kGOqNRE23shhcD{S*k8H2S~ZR5(=OG0Bcpv)j(Gw!Za z?9F5qGp&{?4O}AC%#Nt`^nwqg&R)2g)uqvN$TkB1cEdXQ9!swjioV(7btkBkm^&-)i`r_VzRwzjuJmAAaaBREY%jbz%&0x@LQ7le(5JEV7i=YvY7v@^Fi z7TzZr{&82f&?*6e){Xe{rC#HhdbokP^NH8P8Ey0=$DQ@C&P&VXezeX4CnR|h)x+#n zx!#u(hw*<|7jt#r0(g14uBank5NZ7Oio*tHYR@6V~2WZ2zOPXk z>t_qa>?&mr3G_7wIH9;{q+g52s>0w6NdkY?nIX!rY%o|kC~TQJ30gU%xdJadlxC)M z{q`a;;m}mBO_p31i=B2;^3n0vBNkgU(@h3_zAmi0SSe+^_-rq1s_9ebXUDLfSR`B3 zhapos8EVa~W4$k9;%9f~0Pz|aAYC_>o8O-zJlvh!zw;&jD6`G@=^@)=amg}}@f?&x zISnsoxDC^sRAy8!E}ic3XhxK(cUs?C$>GDby9n5HmY<0n4IS)%*)r5}Wa;JC^b) zFwsNv)M@#i4ta{BK#)Vp4QtE(Gv=5O!Ajp!&gL6dbUpR4k6JopTfW0gGHL4hxelQ? zk44H`pM!teNr(vVaBwHRpG_}b@z9cUN62Ys@x7<45C%@$+u7NsPY*_e9?bs2U@&DO zoSgC~&~S!m%wo>0PMl+MyOK%ajNld3XuaTHnY&>5mAQ2pOJ$UXv~n1}ZjsKChl)>A z5eK`htB@8SyPn_1-SPCg%gV0b*I+}+CFhQ%jL!rwX{dX>dnF_wQ{F2E|0uKtQ>S97 zkIkNtHWV7wwrS8UZJMtc)ivwnmR|{HIjlvktJ>;5suNPDn#LmfFN`vXt{K~`JQRnR zo{>RCK(&=*K+9bP$Z6lM|$5E4ma! z`AGT3(}Y>2!xD5P*|de;aqlg3n(6i!Rae#dk~-?&;skE=qsok_T+VXgmCc+R^pINY zNpt^Fj!yshJR3VCJZ!NwP;;=B)LZw6Yf(jxMp_-~T#cGTla@X19Cy=~u24+KG_wtD zmk0fQqTeM4#Vs$4y}QmbzL%cYU31HUIOg%gbx=~A}j-nV(HGIP&v9@z+` zVh1X)UFaJQS6%g?HcicY5(_)J(`8CupneDU8&RQmHLVqMuZwRo@yO}@(Tn!@%33}{ z*^F4R=FNyw)W*s>!?%&+P_|*?!dnD=#HC{q4n8WM>Wte59nRTk2sjbB0bdq#1^~NX z>aHyvIe+OYcXN^{d1U!cj7=^C2**b1G(DqI=f{6`6})MZbV;qUIO5gWtp(3V6lzvt zQonbXt-+7No^Ui6MTgSj^6UKWEAE{(dYd1iAJd&GX81LY&of(&Wa(SFTz}|G?$+I@*IRS^{cxrD32(eZY9t zznBxI9^)0XOPIFsd3CEx@By1+Qut%=gFof>u)&Q3wkv0erUsyenHFL#Cp|6DO*QiEU3yGbVJ-et7L!h z%o%CoRo|^49faP=gIe#XYwDfWB3_Q7DwTvivA&>V>W$1C8wk58ThcAJRgz?3P2M6qYx>uR1?bg`*<m5>(xLVTUP?W!?Ew_d zmp?yS+fPXX_GGbBKO<*=7es;ioZHDw#Z&)n919v^RghBcv9M#507r-hP4IzvqGa}q z+vUf3uczkrlMfgwnX&tA!)c2NqsS`ju9qnhrY0@(l;SLx(Y zJmwrlW9m`u5UR%Bl+!rLy<@t(%>ZG;_TcNagj5)(4Fi-(bO-xNo|wfiN9)W(@Q8GrDZuA zk`$?x2lY`E7m-s{`I_~n3gciyTqkk+6gapKKHRnysyysBEn)I?K#(3>II)l>6ME^9 z@`N9Dr%ojXLr7(!mVSL4GQL);eSOaTaC4HPlgc|Mz+H_Aw$@3N2U)~zNFI-aNAq^) z&d2wAK1ttv<~MPPFa6}VfBLFbvQ@5y#t|LBj~F?|h%yiK4el7pJTbWO)3CO%WC}&< zKvwSl;&Lnmsg|K>dL;L@mfziqY0E^nNrXFrzrTbX9ohw$GNFT~JmF)VY`WK0!>^v~ z@wJkYzzNV(5fpz4?^_Zn}%+?811(CXp1b_K_|-XE`TKhB(;t+72G z8=furl`LPR(Seda}2# z6*dUR(eI@&*;$vq~kQKKtP=YeqrJh-7zC3m-a^nsTni>&Z~_G_S)1((D)WW|u(u_6CNujeh{3 zx0ULZ#GbA8*Xxxl1PrUmnrqTqz?4xJ9^B!$A#L@1~9!)}l7xD)?^&C4)g-`K~Szpo+n`_cc@rOnoTb!a|JtqY$^@2|I_LD4V% zV)k?Z5Mv^Li@2Vc_~`t^b06K$TMHgltf%aMt!Xj?K|4Pto zM2xp2#{Bj13A+5)Je%rD_Cq$-HI!$WGi%zl&+Cnc$s_4*7d=n&mOhL5Ts-lP&hi03 zJ}azUZ;-X&)Yagqi_lDM-Hs=$wwC&49ld@VPxUDtm008i{tq?b;Q6>hI6bOMCnq6ME8xlkNBBXzv*x_aI9}`g(bljVS2$ z21Rdvma)q!=??t3yhaQ=oF67DlbDwXIK8WQ7xLn*XC3$ZZ|uIU^$p5nINrH)r%@w6 z+5!L>M|x>(Poke;d>A=5L=2(cB}$`Pds<1ppaX*Zw6Mt}(*avC{iPV`@Tu2!(|Qny zE3Qn2cEg-Z_lMU`Zts$weg55iuiHq%rN{?QwDZcE%ZpsJN=J0>(MavM5uOL0Za?=C zx6)wRrz9TPlN>LRo7qt5i>KP8Bg~7PELsGg2(WANo=u92f0Y~Es!lU=u2p@nF4FV` z8gIKDabfD0yv#A@+p|FeGHFHeQA?8M&wO52ttus26S>zM`fVH{#F3Sn=D}0n4(l== zO?=s>s;Y{sI7ML2WQUyw>GdeJIN1E0nVEU?r%x6bu=eMNH}BbY*05T{P)wpSdpYdq zcCO>+)*-$ZrDxlI5O-7OUTzP4AeS^H!ERgrbN2K0`3D z`;pRq4=C&x{{>5HOk&CU5`OO6YS>cgn`p*{JN~39~5-M?N zLghM#H9d_;niGh8fFXpDH^a0Di$~tmq)>-(R&G}RHpbTUHh2bVWNNlwVWhd2Z4>8m z044%@wAf*E@t+X1+1#VRS@Eb>>cps7r-AQTZKku?Mc03V0-*KXfdBA{egFu5qwd>K zUZTYB_rhQU`l9s4`p-J^$G7qr=3l9RjrjwSPV-2a^cexpgI->~O#5!ep;hil#{Z*_ zr6<=4x`nQuW8|#p`y&G9N56<3@Hy3HCO#Hi!}4}eh4F!e^1 z9p9+Afgk95cXyd$LdlQA_KE?Tr%IpU0;@5zKv=sHZ&zhh1S>s|e5>*)N}WrUtOb&xk(%T%ug4xc{_n;0=ID zbFBZPZGjl;-DK;WJLDnU3>coey1Kzr9%Ma&bo$ATn#%f23+D??)86flpNlEg3C-e_ ze0Le1DF5|HM@L6*gCKxLqr7@Sh*HtJkCg#OR6ah!`zy(B^ePjFbYRKM^do{X(Nxff znJk~RwE;^rbXC)gBrTN1z%WvqC)iduriVV=O>ConBF~&)RhS1%cqhzy_L zVAw9wRRSLN76=+H%jiRoxU6+%*uM5wO#3!F^?tGwed7wL=o7=*&i?lEgPy-~1b0aX z6)59;Ug&qH%#X>LCu421q@= zTTez_i>2&fQl=c`;}fCmmoIh+gl_*+hE52G@5k)Tro}aIMUKSr<7w0`o!;(luZt%% z#l6UMs%qoU{`-3Xvjr$lYF0|)U~YD{4PYge>~~1(gu2!0m(LI~$*1*(G>0Y(Bhq0J zi$U12D0o)M_9qEapCpC%?OaM-6^}sQT|5LvBG)}o4e>z8{MwJSHB%DBB1%X6krg-k zp(*{J0BFL{_4r3ds&lbAlMhyQeQ80}fk}IqJLjn!U`}tm{>rQz3q4(2?4{r%25h<6 z&E-jeSZSU@n>l8azRWJj*-9Oe_bMp(Hf>$@-3;MiNmPN2+McmaUoS_*!`K~q=h-#o z-)q(YB0?pwxWjSd(|wIHL2?o=6=_2Ws+jA+?nlKU!wa$RBPdu zaq4NsnK|W5SX!~*6H>n>5Y}3wb&4JEl*{IXs3qnko|olt9L5Q|PL$hsAXsfb&t zx$Rn3lwWge%DEt3MoFDGBc`TgcGP_CSaTBMW~yztgCg{(e4tWSzKXf{_1x`H3yWZS zs8vtpE1U+j|3)}m)%~(`(jb#kIMo&LAO?0*&FW-u#+_-ZFX)j3$*V^FvRz9pb|7RZ zvHij$laEft{v*O>#P+U5$GEE}4rHA?IUbqRJ~_iGCfxEz%Q?EZP+p%i$ugb^)Au8p zg~~&A^r|&c`X?R@wHjxibi>*oGg{Rd7t~o)nDc}0{VSeVC0<8=V63o&4fw~np=Zk0 zuS`3ry~WV-mT#C3H)IFJpV_iApIgIX7LL{2w*NleeDjB-02J+sPQesqwy106O?4(Z zzg5IU0I)HY5+C7E5+8dcL$h!o@h~XRKK_d?<_E~A%U$ya zzFg33;)sBNIQtqoKOc^|sKtNCB-2Oy!=PDY)*vrgs7(L|bN8yzzNS`nz!J6= zzTn~95ps_GAvQ^9*kRg#b!LGjo7^^O7_zLw$Nab2_$hnA$xb#;)eSrLsN=>to^PM4 z{G1X*!5 zS$V~aNw*}d(--|s%sXR-*zf?#&^>lO@5VERC$w1-Lml2Ut-)}Vvfwi&XEiC=AXYt z;(MbPgUr+O0q}?n2&7J zHE8+;s{&2)A@!`Iw!Q2PCG?dmIHB3%p5v9TkHsdm+_suBWqQ^tis)u2npY^Kn2X&S z@cx)znb9GHzY!n1VH%OyFNaZ23?3WvJAd{n?A{sa!}O~PJ*LC#>drC2X@@CJ7PX~B zx5wS(i^!#LR(*AKUklY>qnA71n?+V;@*4ewe3rf*Muv`h zv^2vwydM{`KBK($z2kaCq4i`(&T)w&E>W|0ar%Vvb3)suwMq*tvyNg59^-kk(t^F$ zFG~#BB##o<*wdE;nZ?CyFTCmmhk~D@)OAXa7f^KCFE@O!Nt9rl8DA z@k#yL|5*z_iTR8qCoI+8w@?enl2Xw;$E~eAFEeDPKHt*_feAn=#5lI1j~!A}5z_W; z=PmOd;JW>zcj#;vI;HaWMaiVP>gs$mb)xNgi<~|nxOU>-x-Ps;r0)3q9^F{o0HVHxQZ2dpO`Wb|JY2V9<^I2v{Fyv6SJ=(BlC2pZ z$~DZh@FfBz=n4nz=QP4<0BF`u1cX%+@pbLxCI=uuxtuv+ZV`jzb^E z(DhK4OIv4T%0E7a@yk0tqr#q?_MOiOzFXvFjo3GZk@M2>`Dg(#x1BKx68&d3`~6-T zB4P5uwa|8g0|u4zde)db@QC`OaWK4P@L?#-AaUMz4y$zx@W~}WWT#y9;X2@rx(CV2 zVU^R<({^igAm-t20r2d;h8MhcI%aZpabu_3XBqtki1P0Vs#F}ppFbSx5Zu1!&ga-m zK%yd;-wlWcc0a&uoh?@r3pNhTJr0o7#Q~#TDwNA ziJ7q*Ss!kwWe-gJTQKgHZ;9GEdHRiI@Q;s=BX(_5aQC-AVs~H2%`(Qhp^v`4b|%K@ zCOuOQ43tb#m_w8uIgdfy&XVYk5U`5}XtGywXuR>C=bC?}E{oN9_dEf&sMscdyjJfubf5{Ju04mi@EbF5{p3r5j8?Rph<>F318ONn<)*7Hy{T z*2nzCmhH%pm2;5(xzX(=>`s&2XF!_1{BEP>)$#Dc7j;)zE#Bwkmiq~^ie=s>v@See zyr$hWG#5<+9IA1lzC9${{>sD7=SOi>D$H}(wZJl)QKnbT6?AAk3DV0Rw6UDMhjp=f zErTbhmp^_HCuY80K<%AMwBCi2#rZ51j>`K1hUNlxirIGMj{NT&n|`zM2tD{{sA=5T zcT_J$GMc_-A_Vgh8yq-L8q9Yqd!o^*SlVMxiFrk0O3LMf0TS1K%GWkG16e(Q)u;nb z0L()Rrn;ElfSfw$gg|juv966BmN|%7c0_j&jj}zlEL2Mh*k<{Rbvt&BYgqV3+-|c81aI5jB4Np-^I4u&B0-tYDlCq=mSe9(Z*{p2&CQh`XS5ujv5x!XV;v?B zWRlzii*1h;&oFE-J<4T`TlKor%hvU30j5(WH_}LO(MxsBN+qyQXn+N=J%(@zD2Khr zC7I$GKTX(FyP*;+?4u=fAnz|)0!=JLOuieI^l5M#n3yQAv$M-ue7wUVy8=qlS#t}( z%Q(U7^(v1D%SU_3DMGSscypiIBPSj&4t*Zz0sFaqA3gW6S?tdqAbltW0!Xm%aEIq& zGH`o`rxEeA`kN%lHTwk*SNhY1k_U(VeqOtMJIkGNMDHWGt83J@CTxl7cJY->)u23D zL!4x*Xey2<|14tBrF@>kLUfwqn{2l~nT!|TidWOs=<9!|h_`)vKyrq1t**b=@y?$L zaE4NswSde}aRKf~b@&!5yf^Z?bHFYTu{6~@^1U`f-jv||JLkBTj^uq7i!MplsJME# zx!pBjWHlD2c%tAm|Ej+KcGqOvCruh6hM>$dui!W(9yWR+mTmreE-g&>?TBYb!+gDP z6hPg?=hUhU?2K<16nm9_elEtG>PYQoz@*HQvU9l)>^s6@;Gw10d=8AVHBo=-Z?4R^ za=TDXe(Hi=zNh0-qUZ0;u_MgWOCvc!d8;{YSQ9}Y*7E}mA1e z7e`Z+Bg}T~`Gr#5&3D6GV!WS5!F~*%043^Y%g65UZ`IhIEK)It?Y*E=YLe$nkyEd~ zB0c--(={OpYxCrk^7=h#-r@Q~kDExwlg`C+UT$iGbg-hL6@12g?`To{(bC&by+wZg z%D#DdJo=)#DZA#8cjpKxv}NHTo;n~WV>ZxS7yYhLK#gMGZ~JWE?1qsKS74#zV%xL!8|fiOx;OzhqS z?LZ;fQ|2UegZod%j=*26TCG{I63dwOAS{h zZCa)lom`Uu!cC^}PUw(ebtgm`@~du0=qdz4pOb3n{qU<_L{r+buKCJq%UI6x^}@Ti z>7tr%ET_=6sRe_nmMKMbqet_xVcm#mT}JT3ySG(6=7|xzc{yen_vl>x@ay4C+6>yv z^RCjBs@o1}fy6pk=F^B}Y-I-Yhr5o;^4ZJX+V$*uM+qXq+osTa?rvl}%_}L!>ov!H zX190yWth`lX2=Vnf8kNfUsuMNnI3sw8Uo77%H4~P8)AO^C^X5|-E>IT!k^Z8m|rjO zFsnrJfZ&ygHBXz7_H53uRwDK33yH0GDg6O$)-0DaAJt4a*VdlWJ~?FZ>_1fy3;WL< zw2QvHq(06$KWH`o9qjFEbWO^p@4AAV7jxTtqS`-I~&M9Q8`#?Q<|tOPehIyB5Xy`P+85u@ss%!Lj2Q(_@r zME7epR!)PNcH-{o>!o&z0sDz%kFM93Ub}=?&A(k0tbUAiM}pEOK3)lgeP3u&0jA@U z0?P*bmiHI}Bt2VK!ujFH=HNa3nmEZ&kyV_y^n&A904?YxW4YamAPTB8rqnTIJP>F( zuQrjKxhr3j4*gB)f}nE%FgW-;SQDoD$3`?NaVVuxu|_(dnxNv#iuslO7}?NlJ&Zz-!p>QR!_?%Tqi`Zv{@y8k4fq`=yu~C_3 zrkWi=aZRN3Jl(f-Sg)vm>H*Jm~d|&2f7#i zg1OD^nkDa%&&NDw6~O}F&?)3GfAZB~3naiVp*ZcRpYwvlK&UeDCEop3+y)$QLWt_# zn)eEJYCC+OVX7!7@xy~-p+~m_=#Jle<>O<;C_hm<>IwPRm%7t*C47aB*>jfjRvOL| zVUp(Zwh`=F5_>jei8xIwtMobcOa+D0 zVn1t!C~uQH#x6%LD5Zq3v-Z;JI|dTI{SRFR1Va}nVa@#h^yi-2lB{a*H0 zb>w>rqK{TStZ{1S)t?Qai1m?4pioigR6~esU1e%~=#e^MS|_j-(}SuUvd@fPxsuoB zne+yT`{8)%Etk4m&!QWmE%ZMe`cEB#G{#kQzYqPGFK@f#dd&!kmQY?Rm5!LVT^JQ?{Q6Q^90s@0Y@r$-#}vZ(Lg@6e!({^NbXX>GqVd5!ebX#g!`)8X`0TI^4)YV2h1i$PL$wMGFS1_oOH|SRY{kH-nD8R`6iUe#;KexM%{LZl2&d^A_Z?Ggb3vmy3z1H;J z#S@ALwoUts9J9b(nvg%rx*yK4a-&{-s!r&u-O9@;;(vbd-4cBF-=cpE9UV`@_(9L_ zT?m+qBc&0VTh34p7y4ReuW4*~UL04(N0y?$@LMz~yHYy+(!or!Ym^K~S52&)=HM zkjwRoJ$`B97}J3Vs*d&FNN~`%;0#A!K^~43X^~nK?yBE8R#2m}z2H%%(6Hl-%I7-c z6K+58olm{Ff3CL|_JhZ{rnFx)BKYYY!480Uic))RYHxn;0Gz04^Wto~95n624Fr+D zAV<~CHrH3UoOl``$VThK1MB0GmTj;`X#LvDZDL;3$sx%*cX0)^%u7D9 z`3@CyU(G)CWKQY_SqZJZ5BjjaJ;zGBg`ODJinD+p zhCJn9tOK$7R#ts_wYkM56h!)#Zsto0OUyQ{_(;aPCHAeDFR;s^1zLxiM`F4c4?isL z1oGzabZSpKQXPmQMEFK@bM(V&yk32Iy#qKBKm^UnC91>sP6X^cP+BK;DXe!n5cLW!^a-DocOduMB{zHVl|u z#*iKqgk{K?PERox6F&ZQKAq&Q#O(CYl++TB7b^qOp+Mei0)r@9DX^V2W2bplxvHw9 zvHORV0%@LCO!;iZt==gW0GJVDRF5vG2<3a}{kG%?9DMxWPWI1RaS&#}&u?$)C1PO1 zL^!@o6ZiIBEx$^0qh^GDb+2T|5XKEM2@_waUC^J*-81>;r{w+y_ooQy2M=27mX9pg z*Z4?+Ph^ql&F}wZfIvI1BY8V?8K6)FV2*-;yq`-j1%?we;qwp<`~MZ;e!Hle^X-PmH_mVvF!!3t9%+~lK?c(|}qi_u#W{N{z% zQ^7!{xB;33z;{(OwW_YYk1mTYXYHYxKP@>eW0~sY;NT^BxA4bJ8Sc_^s+RD?u?YQf z*(&`>VaOv%jpcR1deg4wu0W)}v}i${DP8+qLg>3X!Rx2$$4V^HufAwJ-ayX%@b)gl zUj#I=5w+5B9?B0I#-0R0n-?0!78u7C8ATIA1YJbSB6 z^l1iZtr&>Qt^`axmGioL*KmAi<^zQSWA8)*Z2nM7K!sbSN=4toGwF>5yuip?%=$rD z&FQ4}d%CQ89n?*)bgyvs(}bvkS3^OAJ6Dt1U=ZYN#qOTY0!Q8I>hLwh_ziBu2vFSK zsdsPhgyLrF#ND_^ zTm{&DU`hxF?WE=p*$Pkl?%$f|9FLUojds=+J*;OLiHD7AtExkf0Acqvfa;?A1O&W4 zDeV2^0D;W-aQI)BgX_Dh%7;xh2dXeG5_-eQn z(aTkRrL-H9opM#1s?APtxE+9vIGiZu(YpQ0r`@%tnV(%m6m<#4v(z&eNYCy^k6(gE;FY>>9tCk@q&k!CH$_hTV^8I(A2iv z7VRGVq|828X!Ex3SzC%JI;X#`v?ENhxPR`Vf7RGuV8jFiulm3gW#h#3$CwMS5^{xo*`Spkrq^aEe|}yVc6u72|~r_rB(3 z8t}wOi@}EIXA-#iE~XgJ;Z=?AmT{Uo3p&Fe(`~|Km@52wkfPr^wdHi&P5m<84KApG z+3rUS{=75U8?_kZ)Jz6C!@T{s{+OK3{M$Cv6MYxl6HxJ*H=QKuF=_PS`({Hs}oa+Ve z68%T5wq&+zQx@KFfC~}+>q4||JT!nTIeG@GnWC)o5Z+2g<6?$M`=sb)zLOb}Z*uol z8@F=ae;v>^IB5Ai_O9poQ@Mo`=$zm8(`y_}kF?^37(~`G0@QLKCu1(V5mr~pj7U-`TWE<%<}wK@y4k_)&As8{4F($uF}JxnmuXcv1xzp zqtzoT$tDG|2^DKQR}z4Y&MJK#tyk=EQU45ZpA6ZCl=1oDtlVq8t;^x7)K zd_zTM#t;>;w?Hw(Z^Dmql_nrAe;fbyfL`&PS%J7@g3j_55PK|402zRC%z;^XoH_be z!`B_A$o82rL0T(9z|j9??Fi41_dwa}Kqe*3=AJuuMV+_O($d&cGakHPYe4MS9e#W{ zo(POiY9#M27@`4+P_84=6?WWVXxpnd8;JFw{SS50ISJ6_jZhRd zcS6Tirm>WP+FZH|wMNU~I+uXP4cslh%>Q)M=1`Eogpg-$_E!Kl)vnOp&##I-jC3rb zcY_|Cz8X=-2887a%Bh8~*JSt(3x#daLa`F4pLBMP(h7O@*W;m8R@6r}aIZx(v4)=2 z(_mPyO!>K0hKemXDNaQcz2+naAt_UfA%CD~wcTe{I|@MzPWW!92Y6a6`p-Y5S9*MB zK2+h>7syNUQZoMS3w8>>5|pck=L5!+JSu>c=!z=+h<4B^;K^PFZ@IlHvf`;aJ4u2V zC4ZejlRawA=3Ld@n9E-ED0i?gQ;Vnu0P%ucbG(6k~K-!+(OpwieVgM>V+LWun(}{E8i>Q02m?+V)JG9XB%f z@umsYSzK;*<{#J;D)@9qHre343Ur&E7ivzCV3kj(tdQN`Cwxh*i$J~wZfjjyF1GVF z7qO=X3A1oSkv1sPe<+!cYriJK*9ywWfAMRm83Q%u+ZdN5jh%}Q1@cenonsH^T=xad zqf4VylJ+hFCnnxN-a=b}8s0Ohn8#dKBk`{gz74wKw3a z8=Z$tI2i}Gan#f+{V2oSlVO4Sene!zRkK#g>!vtpMvs^rG$W;=_iw3z5OlkhKgEyf zUfnz>9d>Lk7Ck?IhcbGWm+emqACkR$ITMulix5qBq{P8UeK9K%93L01kR#QjKV<7vBPw`Vo3r z(0%AlY&TLS@mJ_vROj9n1pA&L+F*F6WT@%R6wlJmKw56rUV^virAuACdteVBv6%7o zhDHHs#8>5V636oAG8EcxPg)U&TEi_Dh^%pS+t*x?ikm#{4l6@W)V}=EUMz7(-4VCS zxXKDg7qNCoED`jY4|(0^{+=F;V2sgv?eGRqZbJzh^9y%U^!<*WVm|Mr9PEctdBPMpnDe22^n8D(8GB?*<>O5u4pW z4{fw8jFAm)TBGfH$A)93J<8vUY;Zal+U%Y8H<7i`>mi&Z@c12<=QX<$-d=sUWWEoK zyhuj~IFbX;#_W58Iebw&-K`eLN|p`vc1x3OoEF9)fm1I^5PO@k_wMamzp?_6xy&cy z>ITFW?OSoC!+U{= zOo{TFb;9hxw4s`+F6C&#$DBvog1nO2J74XBO=wu}V_ZLvy$w#>koG-MzuuPnlY}V( zT)hlCG7ov$>iPD-{01#5tTb&hwIv}f&p-{j-HrG2TO%jUp*}9G?{tp|4Ugz0aw?u@ z&_Zh1A5vfRbwI|Qov3HS3GuVXqStAYzFRh{zn+NsDX)MV>ByaAE|T{rh3jeWuT#6d zu37_u3A#zWW+spGD0pPBS$pWYjqddY$j*E%?m%nExiw9$RGz-_4|X{B8-0{UI@%d56Dm^1 zPgOWtJ!WRv@>|q@c!^Et?b7K3uAEsV9$30+droYl{L!y2HBx>s5obAmc5yM7w3B(% zDS<=P05yE~)YU>aZt)y?DThPfY}cj=qc=KA&hmiT>IU}J`2g_Ii_EaqzJJ6P6jxZ= zU(Op?VNqHNpN_kpOe#mn0ky4jt5pe+yG&Pd1uB$4Yb3*fjQ1TTM@6IYrCDC%WuqS~ zU;FQKV~y?Ue1Ev7Cpq!0z3G>P|Na02p>yaDiyZ;D86a8Uj9#M~tkC75uG{??<+rX~ z?d3hba?~wJRqCi4b8idRiEBvF;au19iTTEx_t}f{0aY3;!isnt|EigR(ftpo)XbQI zN|QKh;jRql%RR!8t+M zwD9-ByHaX|YVOWML-aTg)7`y;h1@QdO4&6McbJ}3s;M0TDW5MdGo~Vg^gcywqimT+ zhyU;vccPk_?>1Q#!Ew(YvMD%fVLOgWh~}mkZ2ze;=FW(dm!&A-Iq!NRXYXr`Ud7@Q zGWEi4qw7x0jYzS0)2nlBp?~_`4&5Ux0{JKL_%TaHL+BRa^={c&ppk10XNk0P<%QVq z`8mtTF@GcQ_a{55g~qw-jY7}}Ad?R4@XtIu(KGdrD~A}ouj)U~LnA(#tG}w#R&dj= zY%Vn5HTBj@nrKV?I?W0*c~ykvZDG$Jtu{-_ufl1^x&s|NnINeJI$r4MEn`a5ybx=c z_KluX6~2>=ILywJa#f|{16w9GsSo+;H^|75Lcj;%CuW~XdjIf5FIrwl*7 z%@SC8yaVpp`;+~fJUn=XPxhq~z2c4S;oq)NQ}~dz(1Gr~&d9B49CaZ8yn+HU2J3Pw z;EfhG4*i$+Z(eK|Z(W{j2im4fYlV8WflNK_TMM*(c)l)E&j@+bU{!oD-8sV-XkgsyZ^LAro| z4Fps`q$!Aqf`#6K(o~Spdy3elqkz;XC`b?xkuD^PQiXu@novUzNJ1cxoO^ud`|$>ek3gL__%mKe=Ocl%LR?C%v(9ZGTvlHUYZyKBq^G)AK#~QIgwPcDsvZHp!kj z;SxEY>|Ph!>169!n|@pPML$my-Ywi%1o51_LSJQ_=9)ACC{gG1@@tsn0=06yoh#c4 z!lP&T-^MyX^9xFehkXtK{>45v@k@213j^Y4mjerfNOo~YKhITch3Q-NK&)dKdNIK; zU8!L`9`RZU2{O>=r1x<4EL>U4zw`{W%NW+a?W~4e61t!ROy$LmPc<^0-WPs)G35ON zA9iBLF@?xH*IsZkb<#2X!~*kT|NKVBqQC|GL=Ls>cF3+6ow#y|-5kof%$`(R?(xHn zM}Xq4_MLv=a~a;27Bi&XL?)Ir7&&HW0U8b$(}7K#6@JMYxmCD0N-gF67qzmax3NS~ z9mpjU4td8*jXE;x@jLaSsiqBEeaGPeS??>4mNnPi_N!TC+D^Cf6j&;Ysr{{;0EQ3{ z?w=T^2B(8qxsP7(UG+gbB;8YH+UY%_ey4%T-aHYH4(+Hkb{sw6uldPOIdLE(Cg&1+ zDf)}#t?M)WjDYmz70*R44#=J1p%}{iNmAImG0TAPkB+%q@4+~>E}E^7dI9C z`Q;GUwoyC`+h{nJ!{BG=pQfYlM6p{MSD(t8CqjEAH#XY}PJq-{Z<=yo9TS2yT=+pB zCU!-X?#Gzq{KtGl;Tl-xg$Ec zmFON>r(Fu3!e9SzlQojZRJF1Y6EZed2!koL6LH%uAaD9+{JmVk952ka- za#rpF`Nu=Z@MM>{Ze$K#PBGYSv+`SFF_5#O=6@_ezn$$uY)NRAvrEZAx`U(R@LEuU zOj&|dLh-mHqG4wHRtF5?`SC8yc^dyd3Mt{kvFsjN@3&~!8V!9QK{%!Q{#uE#dR`ue45`&fRRD7b6 znmM9(r{zd}J6@2nX#m%pVw6~ILi>cu^*7JN9mU-f+S<&@L90XI`lhxI_KBjp-A z{&e=U&_AXl3Xo-Cka1PX{9b02E7f3N*@0_}R_=aqTR7_~LB+Cz)SuDy@2;4WCd=N( z_8Gc_o&!n09eK$X!sm~fN6z)&vM4TwY`jH^t);Cfn5<~?6BI|&?NZ(wvi~-eFvgi* zmI~4ytqiaD@jkXDg7h=`{176&Ip7y^ z5t`qrRQjah_ROmi%E_tf_FtN?&TB`C{f^)A;sv~~&4!hF%0qDz!Qg9738s3=dI^Z0 zDS|k29wl1mZ?%N{#Mji=o3e9o)ToKAkQ0PP%M zF?qt(06kH=@-d(n^+FK_SRJ-{`=+(GB-+XbZf2wq_fcLz>k>>fHP+}t%v_cH1rMb? zrZ)HYBy9`>ks6aEPK`pu{O(pV!+oljEge0=$wVn$78v;9BH`3~H(0sPyytPNsCr!eVl*|ZF{mp=RPmh5^M+`mtnDY}j|kFE z|1SWOb_)g&Fens2aB`BH8V;T+T0~T`E-BB81o zdDSQ?N{(_luQqLdPH0VDjTBlqmH@t)YLkw#rAr}eP5!-1o;iCnWqffw`8elec)@mJLc)oXhK>E z^>#5NwOENf7IjWd3k2>yc;LCPOkHG#%IFOb92j|#fPX{JF#yfEfpuxTKQnZBN2`r% zd9+$MMd>ya#se6)Q>}{0eEUrw&Ob``JR~C{<9uWP<&?*lm13Y~P>X>9%V$urnP6xGHqsZJgV28&wIKi>I#Amer zhJh~~-7 z=dLEqsfbWY(w;nZxb-kN^AI{l7M4P;Bpyo4S>3U+!K$Lt?5u$U2hQh;xlWA54Gh@M z(dc%n%qe!o`*Mvrwl&p|8w*SF9KKo|YyAy}Tian>w>gj<^bxlgYDYZ>Pw#*ll|+P| zX$_<+?MYEOynk;7GqV6%luilv@im-?V3{<@Y(s7mhA z23A!piT}>M!XUOwkq+BBKtarZqf=W8sPUiV7(CtSo0OHADe}SulC19%O;F3U@U>p( zt$c^(Q(?K))^siRW&s{RE_&@@5mDlzg+*)zw_Dup?zhI>r#pjZdJC<>OrRZ=OEhSp z-|xd$y0mt1uR%5K0B{D86G%fod3CVAO5u-qGDA0ib8?QwL`01~;m^4=<@Gby1OC>< z5W=~6aSy}gRPMvtc}czzW4Y7R^U0`rirC3RoQoUONTn#&k-#ZS7xWXHx~w;j+(vJSEl$Q%z zdtyG z$8L^&IWb+3<@e>=S!to5$;LC+nliM!Ye-aHcY)-~Tn&-*D+?AQRZyj%DJrkb&=LRT z%b&j}K|w)hF7C{N+Z|~qoj-M!sP1h}l*6W=8WRmOFkHZSS*r<-AI^&{u|LIKZE;jH z_nrxlmFYF{LrAI~`>QapCNo_=pA{B)i4aVmj^~lDligTcw7+-nDBShNL+kAD@+Fma zE~Nv&egy-paGb{DrrRHJFQEg^O+*mt-dh#ssABT-;k(CPav(B)U6)O4@jY*2W2&@o z!5UuUXL{rJTjLwAze;_KmNPUKY13W5&}JgC-Dwg$EI`=Z-hctnpqFTE>)EJp5fHmW zx|&NSjaM&tK1ug|d{Dx>i_bFeF|NmzQ(Vi$C;cV9oKW1qcM{5p-$fvv5h)fvdD#%* zNsISN{1Tq*q+X-g^G{OAaj2+xBPSO9_fPjq@SK;Rz{&laif< z?S=Fv&9lQq-(?mOih0KjzIHB=d!E2RiIa+g$Ap8j{ICH!O4-OmA}@GfAVkpNm^<3j z^Sx>E^BX~7Z({Cj9tT!~2U18rE;2pxyF^FL-U-)Va5$X!q=^yP5Dsw>)ST!zh}5u7 z(nwoZ#YD@Y6=J^212ZM$QzWK}%KXL!=gP`G+pSzmjt744p@1I(>K>tXJ;xskYvR_5 zeI~lGgL#S9B~H&D0|-0yv?qsTf1eUdLLl?j%&X5~Y4w+RAz+S@5G^0_iL)mwb@=d_s`058SlT%W0d5pEbs6qfE_wAI$A5?N1;dd^!0I> z-sr}o(IyI_HO^3z*K0DwnLy5VCtzT1aqmh>;*YM+<3`{wogE*2SeNQf6UeC|O>Y8}6R$b5FN` z*x)~B(mhnh+b~EU#H#arZ+5CIE1nmtRT*AVPZkSZWF8M?#Snq#r>jqNc!AX)zlbk{ z_JA@%&rTxAmI9(;_fR*IRA^A~hhf&`i)IRB&rKBOHqZDB_-i0AV*j}p0X#|`ARA4$MAS+I zmLL*;t}qq$5eKBnp;P_9Yp>fwg?x%W0}Xot37s`beey3706Z#NfdO01F7Sb}L(lAl ze^(nMqko1}jg4CRe3>8qXRX{0_x^`KccMYRYN>bE`5@+k6W0G+#eSakI*#XKdY^+CVIiyw{>+?v z)m2rRuT$6W41_UvRp^%>3xgj`a~T<1UG&YyyNPH z>(w}c-)}<2fwx5qRsaT_Lw`TZn)uXPyw1zOw$;TL+|b$IPPhBSbP2`Obj)hX1RB^j zyvq0cY59pc*q?xHE#KJlq?IMcHK}^kR7F87Nw~#oM!2gsR^!rffy3)tJ69Fi7yf8d z`m{x+7rEDQ%TJ~czF+#bQDW6iw_9eOHkCGp)Z;o2MxIYW*UZ)L_it|%rvyC`lk0}> zf1k$4L($p)`M39=S#!roy2|glJECFH5AGCd9d6h#qozgX1e$Z1L^n#!FonT*FBdJv!{< zrnkt5kNR~`fJh+_AC(z2*9VFi9Rd`lo2&Jf#C~8Sl$*F9 z+`*GrDHx#R)4}&XbB~B+V;KoCTxziO>kV_RcI%gv2B~mJ6Bg9SC_L;uy%YGZa#{+F z<|N?b_|PcY$f8jxG&6Vt{M3UHCBP_AHoZ2#x&u0SU)vm|*22gWQQixTrilgt?}^(1 zb8Y9=qnE^9!{qlS4Kr48p3e6hHccd7%N@deYCU3 z2WuDFmAxT7xb@>=`vLe-eH+80;hiR`n^?az8oxx;An!O=Z0j~L%kDrAHN$%h=j;v{72!Y$fgs1$=;bDe2}*CY%lL|GTiXgi!n zrM+O;nbXb7tKYmmOh+gwwwy{Sq3pbMO17aW-`%uE(QDKE-$l4uVjN;a)%B#Ky;$ue6e9@G6SKK)dshzeORv9a>)&(rV*C*D zqv*=BiAy{0s&52#D7_xj+#@Egtr-Xo->&g3;ch(wDa5DEd9S|GBIA`zNpe+3(8w0` z-Yd~1l44e7Z|S4J4^vyWLaFy4G=>D*6tcsy#q`j_{;TH!a-HabgDtN=9yFp2$KFRz zLf{Q?i{=WtHoKpABjSWkU_&|nVb2JXnlu0BA8Q#M@W}hGFSne!@tE;fE8n)Ov20Sw z-Cm__Ik`PT&((fscmD0IDeq_&dPL*x{_3hv=&*0paDB$Kt2F4@_R^=3l+2HeX??PR z)uJqk0{->me!x5lydS$^5V9!Nu@r5fzj62cc<{vJXTO>QrV@ynoNn)GfB9A;Wc9jp^yjCt=BR?yFgTwV5zJYGEOHNtcpE2uLNWbOv9E8pz9; zmT0Mbsoq)_mX=mIXb{tLV^9kq=e+uEjZ4`GBs=BY5%YRo6!WVP)UP zEyO2RKg6E$_;Xhvc*=y28vdxLs!udT%9mtCGDZFzNWJ)$8fWJLk_<`mbs9>I>sfju6NZcM(jtlSJYBU;bvYM!j1qQb2>~vWOo~5CUIv}dy zW@xM|pWHaUUENW}2^>T8P#-n=;ETPFRrLXYfx*o}lDPV=!BLjUs$6$0P@IpV*0ys% za#;JG$LRN-qz8FYpyBE{KA>O;t{bLlQ7whJ1QThizPpcK86^}$241}(mZv2K$+`dT zlWV9t_c{N|{Uc!(ULybgnVqlff9N|eHvX!KI6;8DtxXpIR5wx=;WP6_mXJ) za`-{7xj9<0mpblFY2*X0U$I>Ho@9rY`||1;eP{a6c!}^g7B7JLvpEf5WDs52wCaK} zd*qN#|1OyFk;u4Bdv)x7;9vb~MJ_+LieKqMC5MO;&k2@Pes(xT7y!6K{{2S4 z^PeTBVg!6!mv=%fBNrBKfKoop@eKa3G}xOx0Pe@2-Vqsrzt`CNLSL}w3om_{mw%g@ zy8E-3$Lom_J|D8?9&0~11ppy@s0uGojegs|4N;C99^aR6C`=u2Bjg;9U%I27^Had# zk51}f#|tTj`q@W#C@4GuphGlUdg3E=#Tjv*+!B57pWOk$nk9K=s_?Jev$`vc;6s)W zC+bM0PlR^{#$#u9B?CylEpo0+es0t1H0N7MN{H9cQh;~xpOrH_Udr;W*Dw+?YyG!P z=h*A2?%~pej*5dT*#hrEOIxdrEf6%Kg{ zQxj?1tC&RX2&+wScM05Hrew+(aBnAUt}y#3@UaX`%pdgct(~sVaslK!VJ#E{QxbT~ zNT->noL_|j&=Jn|zv*d1#QqMZkmprnT?XVQxe@#ousUqvUch`OSDHhSn| zqhZ9%dz8lNpnCh&L5{oF-t9~-S0`n{uJc0xGiA^JHgG}+OKg$#j?)*R41RTmW`SZ9 zI}v9ul1iT3Zwz79*2$jOJ=(SHpgiedguVQcj~f3P)~cZZ=mh)4iUO|>!3gj;fP4xsz?=F>A&)${ z*dy`GtsUpH>~c+*wtljn%OrCrRk+euuE(PDuCh@(AY$$=0E_mA%y@&+i_SCZdouJPD2VOvToJ;EpTzsc9}eWVL+~8D&!Uyb|b>jSM5p+}hLx>>1O_ zLO?@24%GANa~u$o&;B*B##xKl-FV{9QV=<%#dWWMttSX9pMh;qh}Cs#I$egBQqd!F zYJKkt2Q5$M0D!YgDe-d1Sh%$C0Sz2oMP_A1_%Or>V{hPUHe&rL9iWZ zV0$o8Qs$K4UhtwQT5x77_6tm~O7&$6E&`kN8qs4Az?`)dZ0pa(7f$RjYT@$ip56m)XmU4r+JfOZgIhvh%cD@gyA5X!Wv>?}Cm=Q1cIZVKX$- zR5Em1_in}+efw=(PS6e0Xx?8(7cp6t*cAr9!^mq?_6tb3a7-z=dS|Ra+Xv!jR!$=7 zvG1apR;c^buxQW?F?nSe^W(2N{q%eow0;oq2$tIWfn0W65Ba~KoR?W3FCTR=;l|t% R=$IS;%uOv#N-wy@{14o_p+Nuu diff --git a/resources/assets/enderio/textures/items/itemOCConduit.png b/resources/assets/enderio/textures/items/itemOCConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..2f59ee2b942c30b7a20fadedfd3753275d74fc39 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBk#;9uZ0T)Y!61Kq1Zo zkH}&M2DyVE%y>961f-57-O<;Pfnj4m_n$;oAYU=SC&X1lLqlC%T~kw2OG`^zTU$p* zXVXT9_&D38P1Kpe$ z?PV6s&x~pME_Uk>%c6Qu03%$#Hu*12dtf1-4$W9y2ovQMv9Px=&k z%+G#a_v#SOHNCp2#)r0O=jp95jg~yKAWleqtI+PW;FoiSZ}i^c{c`v9_gxOl&&vOG XVm$w&;@=OTOBg&|{an^LB{Ts5J8@s5 literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index e60b80b5..b6c47661 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -43,6 +43,9 @@ import crazypants.enderio.conduit.liquid.LiquidConduit; import crazypants.enderio.conduit.liquid.LiquidConduitRenderer; import crazypants.enderio.conduit.me.MEConduit; import crazypants.enderio.conduit.me.MEUtil; +import crazypants.enderio.conduit.oc.OCConduit; +import crazypants.enderio.conduit.oc.OCConduitRenderer; +import crazypants.enderio.conduit.oc.OCUtil; import crazypants.enderio.conduit.power.PowerConduit; import crazypants.enderio.conduit.power.PowerConduitRenderer; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; @@ -213,6 +216,9 @@ public class ClientProxy extends CommonProxy { if(MEUtil.isMEEnabled()) { MEConduit.initIcons(); } + if (OCUtil.isOCEnabled()) { + OCConduit.initIcons(); + } } @Override @@ -330,6 +336,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(EnderIO.itemItemConduit, itemConRenderer); MinecraftForgeClient.registerItemRenderer(EnderIO.itemGasConduit, itemConRenderer); MinecraftForgeClient.registerItemRenderer(EnderIO.itemMEConduit, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemOCConduit, itemConRenderer); BlockPaintedFenceGateRenderer bcfgr = new BlockPaintedFenceGateRenderer(); BlockPaintedFenceGate.renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -382,6 +389,9 @@ public class ClientProxy extends CommonProxy { if(GasUtil.isGasConduitEnabled()) { conduitRenderers.add(new GasConduitRenderer()); } + if (OCUtil.isOCEnabled()) { + conduitRenderers.add(new OCConduitRenderer()); + } EnderIoRenderer eior = new EnderIoRenderer(); ClientRegistry.bindTileEntitySpecialRenderer(TileEnderIO.class, eior); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 4702e8ee..8839ac8b 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -58,6 +58,7 @@ import crazypants.enderio.conduit.item.filter.ItemModItemFilter; import crazypants.enderio.conduit.item.filter.ItemPowerItemFilter; import crazypants.enderio.conduit.liquid.ItemLiquidConduit; import crazypants.enderio.conduit.me.ItemMEConduit; +import crazypants.enderio.conduit.oc.ItemOCConduit; import crazypants.enderio.conduit.power.ItemPowerConduit; import crazypants.enderio.conduit.redstone.ConduitBundledRedstoneProvider; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; @@ -226,6 +227,7 @@ public class EnderIO { public static ItemItemConduit itemItemConduit; public static ItemGasConduit itemGasConduit; public static ItemMEConduit itemMEConduit; + public static ItemOCConduit itemOCConduit; public static ItemBasicItemFilter itemBasicFilterUpgrade; public static ItemExistingItemFilter itemExistingItemFilter; public static ItemModItemFilter itemModItemFilter; @@ -403,6 +405,7 @@ public class EnderIO { itemItemConduit = ItemItemConduit.create(); itemGasConduit = ItemGasConduit.create(); itemMEConduit = ItemMEConduit.create(); + itemOCConduit = ItemOCConduit.create(); itemBasicFilterUpgrade = ItemBasicItemFilter.create(); itemExistingItemFilter = ItemExistingItemFilter.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 83636c49..0bfd7e40 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -13,6 +13,7 @@ public enum ModObject { itemItemConduit, itemGasConduit, itemMEConduit, + itemOCConduit, itemBasicFilterUpgrade, itemExistingItemFilter, itemModItemFilter, diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 688b9280..a2bcc733 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -41,6 +41,8 @@ import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.liquid.LiquidConduitNetwork; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.me.MEConduitNetwork; +import crazypants.enderio.conduit.oc.IOCConduit; +import crazypants.enderio.conduit.oc.OCConduitNetwork; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.redstone.IRedstoneConduit; @@ -66,7 +68,8 @@ public abstract class AbstractConduit implements IConduit { protected List collidables; - protected final EnumMap conectionModes = new EnumMap(ForgeDirection.class); + protected final EnumMap conectionModes = new EnumMap( + ForgeDirection.class); protected boolean collidablesDirty = true; @@ -81,57 +84,56 @@ public abstract class AbstractConduit implements IConduit { @Override public boolean writeConnectionSettingsToNBT(ForgeDirection dir, NBTTagCompound nbt) { - if(!getExternalConnections().contains(dir)) { + if (!getExternalConnections().contains(dir)) { return false; } - NBTTagCompound dataRoot = getNbtRootForType(nbt, true); - dataRoot.setShort("connectionMode", (short)getConnectionMode(dir).ordinal()); - writeTypeSettingsToNbt(dir, dataRoot); + NBTTagCompound dataRoot = getNbtRootForType(nbt, true); + dataRoot.setShort("connectionMode", (short) getConnectionMode(dir).ordinal()); + writeTypeSettingsToNbt(dir, dataRoot); return true; } @Override public boolean readConduitSettingsFromNBT(ForgeDirection dir, NBTTagCompound nbt) { - if(!getExternalConnections().contains(dir)) { + if (!getExternalConnections().contains(dir)) { return false; } NBTTagCompound dataRoot = getNbtRootForType(nbt, false); - if(dataRoot == null) { + if (dataRoot == null) { return false; - } - if(dataRoot.hasKey("connectionMode")) { + } + if (dataRoot.hasKey("connectionMode")) { ConnectionMode mode = ConnectionMode.values()[dataRoot.getShort("connectionMode")]; setConnectionMode(dir, mode); - } + } readTypeSettings(dir, dataRoot); return true; } - - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { } - - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { } protected NBTTagCompound getNbtRootForType(NBTTagCompound nbt, boolean createIfNull) { Class bt = getBaseConduitType(); String dataRootName = bt.getSimpleName(); NBTTagCompound dataRoot = null; - if(nbt.hasKey(dataRootName)) { + if (nbt.hasKey(dataRootName)) { dataRoot = nbt.getCompoundTag(dataRootName); - } - if(dataRoot == null && createIfNull) { + } + if (dataRoot == null && createIfNull) { dataRoot = new NBTTagCompound(); nbt.setTag(dataRootName, dataRoot); } return dataRoot; } - @Override public ConnectionMode getConnectionMode(ForgeDirection dir) { ConnectionMode res = conectionModes.get(dir); - if(res == null) { + if (res == null) { return getDefaultConnectionMode(); } return res; @@ -149,31 +151,31 @@ public abstract class AbstractConduit implements IConduit { @Override public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { ConnectionMode oldVal = conectionModes.get(dir); - if(oldVal == mode) { + if (oldVal == mode) { return; } - - if(mode == null) { + + if (mode == null) { conectionModes.remove(dir); } else { conectionModes.put(dir, mode); } clientStateDirty = true; collidablesDirty = true; - + connectionsChanged(); } @Override public boolean hasConnectionMode(ConnectionMode mode) { - if(mode == null) { + if (mode == null) { return false; } - if(mode == getDefaultConnectionMode() && conectionModes.size() != 6) { + if (mode == getDefaultConnectionMode() && conectionModes.size() != 6) { return true; } for (ConnectionMode cm : conectionModes.values()) { - if(cm == mode) { + if (cm == mode) { return true; } } @@ -184,7 +186,7 @@ public abstract class AbstractConduit implements IConduit { public ConnectionMode getNextConnectionMode(ForgeDirection dir) { ConnectionMode curMode = getConnectionMode(dir); ConnectionMode next = ConnectionMode.getNext(curMode); - if(next == ConnectionMode.NOT_SET) { + if (next == ConnectionMode.NOT_SET) { next = ConnectionMode.IN_OUT; } return next; @@ -194,7 +196,7 @@ public abstract class AbstractConduit implements IConduit { public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { ConnectionMode curMode = getConnectionMode(dir); ConnectionMode prev = ConnectionMode.getPrevious(curMode); - if(prev == ConnectionMode.NOT_SET) { + if (prev == ConnectionMode.NOT_SET) { prev = ConnectionMode.DISABLED; } return prev; @@ -202,7 +204,7 @@ public abstract class AbstractConduit implements IConduit { @Override public boolean haveCollidablesChangedSinceLastCall() { - if(dodgyChangeSinceLastCallFlagForBundle) { + if (dodgyChangeSinceLastCallFlagForBundle) { dodgyChangeSinceLastCallFlagForBundle = false; return true; } @@ -211,7 +213,7 @@ public abstract class AbstractConduit implements IConduit { @Override public BlockCoord getLocation() { - if(bundle == null) { + if (bundle == null) { return null; } return bundle.getLocation(); @@ -250,13 +252,14 @@ public abstract class AbstractConduit implements IConduit { @Override public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { - if(conduit == null) { + if (conduit == null) { return false; } if (MicroblocksUtil.supportMicroblocks() && isBlockedByMicroblocks(direction, conduit)) { return false; } - return getConnectionMode(direction) != ConnectionMode.DISABLED && conduit.getConnectionMode(direction.getOpposite()) != ConnectionMode.DISABLED; + return getConnectionMode(direction) != ConnectionMode.DISABLED + && conduit.getConnectionMode(direction.getOpposite()) != ConnectionMode.DISABLED; } @Override @@ -327,7 +330,7 @@ public abstract class AbstractConduit implements IConduit { @Override public void setActive(boolean active) { - if(active != this.active) { + if (active != this.active) { clientStateDirty = true; } this.active = active; @@ -350,7 +353,7 @@ public abstract class AbstractConduit implements IConduit { nbtRoot.setIntArray("externalConnections", dirs); nbtRoot.setBoolean("signalActive", active); - if(conectionModes.size() > 0) { + if (conectionModes.size() > 0) { byte[] modes = new byte[6]; int i = 0; for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { @@ -378,7 +381,7 @@ public abstract class AbstractConduit implements IConduit { conectionModes.clear(); byte[] modes = nbtRoot.getByteArray("conModes"); - if(modes != null && modes.length == 6) { + if (modes != null && modes.length == 6) { int i = 0; for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { conectionModes.put(dir, ConnectionMode.values()[modes[i]]); @@ -410,26 +413,26 @@ public abstract class AbstractConduit implements IConduit { @Override public void onChunkUnload(World worldObj) { AbstractConduitNetwork network = getNetwork(); - if(network != null) { + if (network != null) { network.destroyNetwork(); } } @Override public void updateEntity(World world) { - if(world.isRemote) { + if (world.isRemote) { return; } updateNetwork(world); updateConnections(); - if(clientStateDirty && getBundle() != null) { + if (clientStateDirty && getBundle() != null) { getBundle().dirty(); clientStateDirty = false; } } private void updateConnections() { - if(!connectionsDirty) { + if (!connectionsDirty) { return; } @@ -437,7 +440,7 @@ public abstract class AbstractConduit implements IConduit { List copy = new ArrayList(externalConnections); // remove any no longer valid connections for (ForgeDirection dir : copy) { - if(!canConnectToExternal(dir, false)) { + if (!canConnectToExternal(dir, false)) { externalConnectionRemoved(dir); externalConnectionsChanged = true; } @@ -445,14 +448,14 @@ public abstract class AbstractConduit implements IConduit { // then check for new ones for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(!conduitConnections.contains(dir) && !externalConnections.contains(dir)) { - if(canConnectToExternal(dir, false)) { + if (!conduitConnections.contains(dir) && !externalConnections.contains(dir)) { + if (canConnectToExternal(dir, false)) { externalConnectionAdded(dir); externalConnectionsChanged = true; } } } - if(externalConnectionsChanged) { + if (externalConnectionsChanged) { connectionsChanged(); } @@ -472,13 +475,15 @@ public abstract class AbstractConduit implements IConduit { protected void updateNetwork(World world) { BlockCoord pos = getLocation(); - if(getNetwork() == null && world.blockExists(pos.x, pos.y, pos.z)) { + if (getNetwork() == null && world.blockExists(pos.x, pos.y, pos.z)) { ConduitUtil.ensureValidNetwork(this); - // TODO figure out if removing this causes anything horrible to happen. Initial testing shows no difference. -// if(getNetwork() != null && !world.isRemote && bundle != null) { -// world.notifyBlocksOfNeighborChange(bundle.getEntity().xCoord, bundle.getEntity().yCoord, bundle.getEntity().zCoord, -// bundle.getEntity().getBlockType()); -// } + // TODO figure out if removing this causes anything horrible to happen. + // Initial testing shows no difference. + // if(getNetwork() != null && !world.isRemote && bundle != null) { + // world.notifyBlocksOfNeighborChange(bundle.getEntity().xCoord, + // bundle.getEntity().yCoord, bundle.getEntity().zCoord, + // bundle.getEntity().getBlockType()); + // } } } @@ -491,7 +496,7 @@ public abstract class AbstractConduit implements IConduit { conduitConnections.clear(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); - if(neighbour != null && neighbour.canConnectToConduit(dir.getOpposite(), this)) { + if (neighbour != null && neighbour.canConnectToConduit(dir.getOpposite(), this)) { conduitConnections.add(dir); neighbour.conduitConnectionAdded(dir.getOpposite()); neighbour.connectionsChanged(); @@ -500,7 +505,7 @@ public abstract class AbstractConduit implements IConduit { externalConnections.clear(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { + if (!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { externalConnectionAdded(dir); } } @@ -515,20 +520,20 @@ public abstract class AbstractConduit implements IConduit { for (ForgeDirection dir : conduitConnections) { IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); - if(neighbour != null) { + if (neighbour != null) { neighbour.conduitConnectionRemoved(dir.getOpposite()); neighbour.connectionsChanged(); } } conduitConnections.clear(); - if(!externalConnections.isEmpty()) { + if (!externalConnections.isEmpty()) { world.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord, EnderIO.blockConduitBundle); } externalConnections.clear(); AbstractConduitNetwork network = getNetwork(); - if(network != null) { + if (network != null) { network.destroyNetwork(); } connectionsChanged(); @@ -536,11 +541,11 @@ public abstract class AbstractConduit implements IConduit { @Override public boolean onNeighborBlockChange(Block block) { - + // NB: No need to check externals if the neighbour that changed was a // conduit bundle as this // can't effect external connections. - if(block == EnderIO.blockConduitBundle) { + if (block == EnderIO.blockConduitBundle) { return false; } @@ -548,36 +553,36 @@ public abstract class AbstractConduit implements IConduit { // handled by the bundle Set newCons = EnumSet.noneOf(ForgeDirection.class); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { + if (!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { newCons.add(dir); } } - if(newCons.size() != externalConnections.size()) { + if (newCons.size() != externalConnections.size()) { connectionsDirty = true; return true; } - for(ForgeDirection dir : externalConnections) { - if(!newCons.remove(dir)) { + for (ForgeDirection dir : externalConnections) { + if (!newCons.remove(dir)) { connectionsDirty = true; return true; } } - if(!newCons.isEmpty()) { + if (!newCons.isEmpty()) { connectionsDirty = true; return true; } return false; } - + @Override - public boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + public boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { return onNeighborBlockChange(world.getBlock(tileX, tileY, tileZ)); } @Override public Collection createCollidables(CacheKey key) { - return Collections.singletonList(new CollidableComponent(getCollidableType(), ConduitGeometryUtil.instance.getBoundingBox(getBaseConduitType(), key.dir, - key.isStub, key.offset), key.dir, null)); + return Collections.singletonList(new CollidableComponent(getCollidableType(), ConduitGeometryUtil.instance.getBoundingBox( + getBaseConduitType(), key.dir, key.isStub, key.offset), key.dir, null)); } @Override @@ -588,14 +593,14 @@ public abstract class AbstractConduit implements IConduit { @Override public List getCollidableComponents() { - if(collidables != null && !collidablesDirty) { + if (collidables != null && !collidablesDirty) { return collidables; } List result = new ArrayList(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { Collection col = getCollidables(dir); - if(col != null) { + if (col != null) { result.addAll(col); } } @@ -607,40 +612,48 @@ public abstract class AbstractConduit implements IConduit { } protected boolean renderStub(ForgeDirection dir) { - //return getConectionMode(dir) == ConnectionMode.DISABLED; + // return getConectionMode(dir) == ConnectionMode.DISABLED; return false; } private Collection getCollidables(ForgeDirection dir) { CollidableCache cc = CollidableCache.instance; Class type = getCollidableType(); - if(isConnectedTo(dir) && getConnectionMode(dir) != ConnectionMode.DISABLED) { + if (isConnectedTo(dir) && getConnectionMode(dir) != ConnectionMode.DISABLED) { return cc.getCollidables(cc.createKey(type, getBundle().getOffset(getBaseConduitType(), dir), dir, renderStub(dir)), this); } return null; } + @Override - public AbstractConduitNetwork createNetworkForType() - { - Class type = this.getClass(); - if(IRedstoneConduit.class.isAssignableFrom(type)) { - return new RedstoneConduitNetwork(); - } else if(IPowerConduit.class.isAssignableFrom(type)) { - return new PowerConduitNetwork(); - } else if(EnderLiquidConduit.class.isAssignableFrom(type)) { - return new EnderLiquidConduitNetwork(); - } else if(AdvancedLiquidConduit.class.isAssignableFrom(type)) { - return new AdvancedLiquidConduitNetwork(); - } else if(ILiquidConduit.class.isAssignableFrom(type)) { - return new LiquidConduitNetwork(); - } else if(IItemConduit.class.isAssignableFrom(type)) { - return new ItemConduitNetwork(); - } else if(IGasConduit.class.isAssignableFrom(type)) { - return new GasConduitNetwork(); - } else if(IMEConduit.class.isAssignableFrom(type)) { - return new MEConduitNetwork(); - } else { - return null; - } + public AbstractConduitNetwork createNetworkForType() { + Class type = this.getClass(); + if (IRedstoneConduit.class.isAssignableFrom(type)) { + return new RedstoneConduitNetwork(); + } else if (IPowerConduit.class.isAssignableFrom(type)) { + return new PowerConduitNetwork(); + } else if (EnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(); + } else if (AdvancedLiquidConduit.class.isAssignableFrom(type)) { + return new AdvancedLiquidConduitNetwork(); + } else if (ILiquidConduit.class.isAssignableFrom(type)) { + return new LiquidConduitNetwork(); + } else if (IItemConduit.class.isAssignableFrom(type)) { + return new ItemConduitNetwork(); + } else if (IGasConduit.class.isAssignableFrom(type)) { + return new GasConduitNetwork(); + } else if (IMEConduit.class.isAssignableFrom(type)) { + return new MEConduitNetwork(); + } else if (IOCConduit.class.isAssignableFrom(type)) { + return new OCConduitNetwork(); + } else { + return null; + } } + + @Override + public boolean shouldMirrorTexture() { + return true; + } + } diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 5cab1929..43a7bf77 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -63,6 +63,7 @@ import crazypants.enderio.conduit.liquid.PacketFluidLevel; import crazypants.enderio.conduit.packet.PacketConnectionMode; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; +import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor; import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; @@ -101,6 +102,8 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketOpenConduitUI.class, PacketOpenConduitUI.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketSlotVisibility.class, PacketSlotVisibility.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketOCConduitSignalColor.class, PacketOCConduitSignalColor.class, + PacketHandler.nextID(), Side.SERVER); BlockConduitBundle result = new BlockConduitBundle(); result.init(); diff --git a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java index 107f8117..d06fe92f 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java @@ -6,6 +6,7 @@ import net.minecraft.util.MathHelper; import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.me.MEUtil; +import crazypants.enderio.conduit.oc.OCUtil; public enum ConduitDisplayMode { ALL, @@ -13,20 +14,24 @@ public enum ConduitDisplayMode { REDSTONE, FLUID, ITEM, - GAS, + GAS, ME, + OC, NONE; public static ConduitDisplayMode next(ConduitDisplayMode mode) { int index = mode.ordinal() + 1; - if(index >= values().length) { + if (index >= values().length) { index = 0; } ConduitDisplayMode res = values()[index]; - if(res == GAS && !GasUtil.isGasConduitEnabled()) { + if (res == OC && !OCUtil.isOCEnabled()) { return next(res); } - if(res == ME && !MEUtil.isMEEnabled()) { + if (res == GAS && !GasUtil.isGasConduitEnabled()) { + return next(res); + } + if (res == ME && !MEUtil.isMEEnabled()) { return next(res); } return res; @@ -34,14 +39,17 @@ public enum ConduitDisplayMode { public static ConduitDisplayMode previous(ConduitDisplayMode mode) { int index = mode.ordinal() - 1; - if(index < 0) { + if (index < 0) { index = values().length - 1; } ConduitDisplayMode res = values()[index]; - if(res == GAS && !GasUtil.isGasConduitEnabled()) { + if (res == GAS && !GasUtil.isGasConduitEnabled()) { return previous(res); } - if(res == ME && !MEUtil.isMEEnabled()) { + if (res == ME && !MEUtil.isMEEnabled()) { + return previous(res); + } + if (res == OC && !OCUtil.isOCEnabled()) { return previous(res); } return res; @@ -50,7 +58,7 @@ public enum ConduitDisplayMode { private static final String NBT_KEY = "enderio.displaymode"; public static ConduitDisplayMode getDisplayMode(ItemStack equipped) { - if(equipped == null || !(equipped.getItem() instanceof IConduitControl)) { + if (equipped == null || !(equipped.getItem() instanceof IConduitControl)) { return ALL; } initDisplayModeTag(equipped); @@ -60,7 +68,7 @@ public enum ConduitDisplayMode { } public static void setDisplayMode(ItemStack equipped, ConduitDisplayMode mode) { - if(mode == null || equipped == null || !(equipped.getItem() instanceof IConduitControl)) { + if (mode == null || equipped == null || !(equipped.getItem() instanceof IConduitControl)) { return; } initDisplayModeTag(equipped); diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index 104f2aa3..6e91d754 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -14,12 +14,12 @@ import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.item.filter.ClearFilterRecipe; import crazypants.enderio.conduit.item.filter.CopyFilterRecipe; import crazypants.enderio.conduit.me.MEUtil; +import crazypants.enderio.conduit.oc.OCUtil; import crazypants.enderio.config.Config; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.Material; - import static crazypants.enderio.ModObject.blockPainter; import static crazypants.enderio.material.Alloy.*; import static crazypants.enderio.material.Material.*; @@ -104,6 +104,18 @@ public class ConduitRecipes { if (MEUtil.isMEEnabled()) { addAeRecipes(); } + if (OCUtil.isOCEnabled()) { + addOCRecipes(); + } + } + + private static void addOCRecipes() { + int numConduits = Config.numConduitsPerRecipe; + String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); + String binder = CONDUIT_BINDER.oreDict; + + addShaped(new ItemStack(EnderIO.itemOCConduit, numConduits, 0), "bbb", "rir", "bbb", 'b', binder, 'r', redstoneAlloy, 'i', + "ingotIron"); } @Method(modid = "appliedenergistics2") diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index fc92ed7f..a6761eea 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -36,6 +36,9 @@ import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.me.MEUtil; +import crazypants.enderio.conduit.oc.IOCConduit; +import crazypants.enderio.conduit.oc.OCConduitNetwork; +import crazypants.enderio.conduit.oc.OCUtil; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; @@ -203,6 +206,8 @@ public class ConduitUtil { return conduitType == IGasConduit.class; case ME: return conduitType == IMEConduit.class; + case OC: + return conduitType == IOCConduit.class; default: break; } @@ -299,7 +304,8 @@ public class ConduitUtil { if(typeName == null || conduitBody == null) { return null; } - if ((typeName.contains("conduit.me") && !MEUtil.isMEEnabled()) || typeName.contains("conduit.gas") && !GasUtil.isGasConduitEnabled()) { + if ((typeName.contains("conduit.oc") && !OCUtil.isOCEnabled()) || (typeName.contains("conduit.me") && !MEUtil.isMEEnabled()) + || (typeName.contains("conduit.gas") && !GasUtil.isGasConduitEnabled())) { return null; } if (nbtVersion == 0 && "crazypants.enderio.conduit.liquid.LiquidConduit".equals(typeName)) { diff --git a/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/main/java/crazypants/enderio/conduit/IConduit.java index b7370153..504d2dd0 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduit.java +++ b/src/main/java/crazypants/enderio/conduit/IConduit.java @@ -137,4 +137,10 @@ public interface IConduit { public AbstractConduitNetwork createNetworkForType(); + /** + * Should the texture of the conduit connectors be mirrored around the conduit + * node? + */ + boolean shouldMirrorTexture(); + } diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index 7e8534a3..66d0f8d9 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -4,6 +4,9 @@ import java.util.Collection; import java.util.List; import java.util.Set; +import li.cil.oc.api.network.Environment; +import li.cil.oc.api.network.SidedEnvironment; +import li.cil.oc.api.network.Node; import mekanism.api.gas.IGasHandler; import mods.immibis.microblocks.api.IMicroblockSupporterTile; import net.minecraft.block.Block; @@ -29,9 +32,12 @@ import crazypants.enderio.power.IInternalPowerHandler; @InterfaceList({ @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"), @Interface(iface = "mekanism.api.gas.IGasHandler", modid = "MekanismAPI|gas"), - @Interface(iface = "mods.immibis.microblocks.api.IMicroblockSupporterTile", modid = "ImmibisMicroblocks") + @Interface(iface = "mods.immibis.microblocks.api.IMicroblockSupporterTile", modid = "ImmibisMicroblocks"), + @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"), + @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") }) -public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, IItemDuct, IGasHandler, IGridHost, IMicroblockSupporterTile { +public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, IItemDuct, IGasHandler, IGridHost, + IMicroblockSupporterTile, Environment, SidedEnvironment { TileEntity getEntity(); diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 04d707d5..5796bb81 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -7,6 +7,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import li.cil.oc.api.network.Message; +import li.cil.oc.api.network.Node; +import li.cil.oc.api.network.*; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mods.immibis.microblocks.api.EnumPartClass; @@ -51,6 +54,7 @@ import crazypants.enderio.conduit.geom.Offsets; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; +import crazypants.enderio.conduit.oc.IOCConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; import crazypants.enderio.config.Config; @@ -512,7 +516,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { cachedConnectors.clear(); - //TODO: What an unholly mess! + // TODO: What an unholly mess! (and it doesn't even work correctly...) List coreBounds = new ArrayList(); for (IConduit con : conduits) { addConduitCores(coreBounds, con); @@ -885,6 +889,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { return (IGridNode) node; } + @SuppressWarnings("cast") @Override @Method(modid = "appliedenergistics2") public void setGridNode(Object node) { @@ -1058,4 +1063,77 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { } } } + + // OpenComputers + + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node node() { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + return cond.node(); + } else { + return null; + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onConnect(Node node) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + cond.onConnect(node); + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onDisconnect(Node node) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + cond.onDisconnect(node); + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onMessage(Message message) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + cond.onMessage(message); + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node sidedNode(ForgeDirection side) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + return cond.sidedNode(side); + } else { + return null; + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + @SideOnly(Side.CLIENT) + public boolean canConnect(ForgeDirection side) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + return cond.canConnect(side); + } else { + return false; + } + } + + @Override + public void invalidate() { + super.invalidate(); + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + cond.invalidate(); + } + } + } diff --git a/src/main/java/crazypants/enderio/conduit/geom/Offset.java b/src/main/java/crazypants/enderio/conduit/geom/Offset.java index a3c16e89..54938862 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/Offset.java +++ b/src/main/java/crazypants/enderio/conduit/geom/Offset.java @@ -24,8 +24,10 @@ public enum Offset { WEST_DOWN(ForgeDirection.WEST, ForgeDirection.DOWN), SOUTH_DOWN(ForgeDirection.SOUTH, ForgeDirection.DOWN), NORTH_DOWN(ForgeDirection.NORTH, ForgeDirection.DOWN), - NORTH_EAST(ForgeDirection.NORTH, ForgeDirection.EAST), - NORTH_WEST(ForgeDirection.NORTH, ForgeDirection.WEST); + NORTH_EAST(ForgeDirection.NORTH, ForgeDirection.EAST), + NORTH_WEST(ForgeDirection.NORTH, ForgeDirection.WEST), + SOUTH_EAST(ForgeDirection.SOUTH, ForgeDirection.EAST), + SOUTH_WEST(ForgeDirection.SOUTH, ForgeDirection.WEST); public final int xOffset; public final int yOffset; diff --git a/src/main/java/crazypants/enderio/conduit/geom/Offsets.java b/src/main/java/crazypants/enderio/conduit/geom/Offsets.java index 301553a0..1b42a5be 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/Offsets.java +++ b/src/main/java/crazypants/enderio/conduit/geom/Offsets.java @@ -9,6 +9,7 @@ import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; +import crazypants.enderio.conduit.oc.IOCConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; @@ -39,14 +40,24 @@ public class Offsets { OFFSETS.put(key(IGasConduit.class, Axis.NONE), Offset.NORTH_UP); OFFSETS.put(key(IGasConduit.class, Axis.X), Offset.NORTH_UP); - OFFSETS.put(key(IGasConduit.class, Axis.Y), Offset.NORTH_EAST); + OFFSETS.put(key(IGasConduit.class, Axis.Y), Offset.NORTH_WEST); OFFSETS.put(key(IGasConduit.class, Axis.Z), Offset.WEST_UP); OFFSETS.put(key(IMEConduit.class, Axis.NONE), Offset.SOUTH_UP); OFFSETS.put(key(IMEConduit.class, Axis.X), Offset.SOUTH_UP); - OFFSETS.put(key(IMEConduit.class, Axis.Y), Offset.NORTH_WEST); + OFFSETS.put(key(IMEConduit.class, Axis.Y), Offset.NORTH_EAST); OFFSETS.put(key(IMEConduit.class, Axis.Z), Offset.EAST_UP); + OFFSETS.put(key(IOCConduit.class, Axis.NONE), Offset.NORTH_DOWN); + OFFSETS.put(key(IOCConduit.class, Axis.X), Offset.NORTH_DOWN); + OFFSETS.put(key(IOCConduit.class, Axis.Y), Offset.SOUTH_WEST); + OFFSETS.put(key(IOCConduit.class, Axis.Z), Offset.WEST_DOWN); + + // OFFSETS.put(key(IxConduit.class, Axis.NONE), Offset.SOUTH_DOWN); + // OFFSETS.put(key(IxConduit.class, Axis.X), Offset.SOUTH_DOWN); + // OFFSETS.put(key(IxConduit.class, Axis.Y), Offset.SOUTH_EAST); + // OFFSETS.put(key(IxConduit.class, Axis.Z), Offset.EAST_DOWN); + } public static Offset get(Class type, ForgeDirection dir) { diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index 650892b1..c59559ff 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -28,6 +28,7 @@ import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; +import crazypants.enderio.conduit.oc.IOCConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.gui.IconEIO; @@ -50,6 +51,7 @@ public class GuiExternalConnection extends GuiContainerBase { TAB_ORDER.put(IPowerConduit.class, 3); TAB_ORDER.put(IMEConduit.class, 4); TAB_ORDER.put(IGasConduit.class, 5); + TAB_ORDER.put(IOCConduit.class, 6); } final InventoryPlayer playerInv; diff --git a/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java b/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java new file mode 100644 index 00000000..a96082da --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java @@ -0,0 +1,75 @@ +package crazypants.enderio.conduit.gui; + +import java.awt.Color; + +import net.minecraft.client.gui.GuiButton; + +import com.enderio.core.client.gui.button.ColorButton; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.common.util.DyeColor; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.oc.IOCConduit; +import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor; +import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; +import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.network.PacketHandler; + +public class OCSettings extends BaseSettingsPanel { + + private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); + private ColorButton cb; + + private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); + private final IOCConduit occon; + + public OCSettings(GuiExternalConnection gui, IConduit con) { + super(IconEIO.WRENCH_OVERLAY_OC, EnderIO.lang.localize("itemOCConduit.name"), gui, con); + occon = (IOCConduit) con; + + int x = 0; + int y = customTop; + + x += gap + gap + 2 + gui.getFontRenderer().getStringWidth(signalColorStr); + cb = new ColorButton(gui, ID_COLOR_BUTTON, x, y); + cb.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); + DyeColor sigCol = occon.getSignalColor(gui.getDir()); + cb.setColorIndex(sigCol.ordinal()); + x += cb.getButtonWidth(); + } + + @Override + public void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + if (guiButton.id == ID_COLOR_BUTTON && cb != null) { + occon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]); + PacketHandler.INSTANCE.sendToServer(new PacketOCConduitSignalColor(occon, gui.getDir())); + } + } + + @Override + protected void initCustomOptions() { + if (cb != null) { + cb.setColorIndex(cb.getColorIndex()); + cb.onGuiInit(); + } + } + + @Override + public void deactivate() { + super.deactivate(); + if (cb != null) { + cb.detach(); + } + } + + @Override + protected void renderCustomOptions(int top, float par1, int par2, int par3) { + if (cb != null) { + gui.getFontRenderer().drawString(signalColorStr, left, top, ColorUtil.getRGB(Color.darkGray)); + } + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java b/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java index ca226e66..1812ca8d 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java +++ b/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java @@ -8,6 +8,7 @@ import crazypants.enderio.conduit.gui.item.ItemSettings; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; +import crazypants.enderio.conduit.oc.IOCConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; @@ -32,6 +33,8 @@ public class TabFactory { return new GasSettings(gui, con); } else if(baseType.isAssignableFrom(IMEConduit.class)) { return new MESettings(gui, con); + } else if (baseType.isAssignableFrom(IOCConduit.class)) { + return new OCSettings(gui, con); } return null; } diff --git a/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java new file mode 100644 index 00000000..ab4a8b23 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java @@ -0,0 +1,26 @@ +package crazypants.enderio.conduit.oc; + +import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + +import li.cil.oc.api.network.Environment; +import li.cil.oc.api.network.SidedEnvironment; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; +import crazypants.enderio.conduit.IConduit; +import li.cil.oc.api.network.Node; + +@InterfaceList({ @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"), + @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") }) +public interface IOCConduit extends IConduit, Environment, SidedEnvironment { + + public static final String COLOR_CONTROLLER_ID = "ColorController"; + + void invalidate(); + + public abstract void setSignalColor(ForgeDirection dir, DyeColor col); + + public abstract DyeColor getSignalColor(ForgeDirection dir); + +} diff --git a/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java new file mode 100644 index 00000000..c0b8b189 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java @@ -0,0 +1,43 @@ +package crazypants.enderio.conduit.oc; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import appeng.api.AEApi; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.AbstractItemConduit; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.ItemConduitSubtype; + +public class ItemOCConduit extends AbstractItemConduit { + + private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemOCConduit.name(), + "enderio:itemOCConduit") }; + + public static ItemOCConduit create() { + ItemOCConduit result = new ItemOCConduit(); + if (OCUtil.isOCEnabled()) { + result.init(); + } + return result; + } + + protected ItemOCConduit() { + super(ModObject.itemOCConduit, subtypes); + } + + @Override + public Class getBaseConduitType() { + return IOCConduit.class; + } + + @Override + public IConduit createConduit(ItemStack item, EntityPlayer player) { + OCConduit con = new OCConduit(item.getItemDamage()); + return con; + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java new file mode 100644 index 00000000..fa6537f3 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java @@ -0,0 +1,564 @@ +package crazypants.enderio.conduit.oc; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import appeng.api.networking.IGridNode; + +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.Log; + +import cpw.mods.fml.common.Optional.Method; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import li.cil.oc.api.Network; +import li.cil.oc.api.network.Environment; +import li.cil.oc.api.network.Message; +import li.cil.oc.api.network.Node; +import li.cil.oc.api.network.SidedEnvironment; +import li.cil.oc.api.network.Visibility; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.oredict.OreDictionary; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.AbstractConduit; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.RaytraceResult; +import crazypants.enderio.conduit.TileConduitBundle; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; +import crazypants.enderio.conduit.me.IMEConduit; +import crazypants.enderio.conduit.me.MEConduitNetwork; +import crazypants.enderio.conduit.redstone.IRedstoneConduit; +import crazypants.enderio.conduit.redstone.Signal; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.PacketConduitProbe; +import crazypants.enderio.tool.ToolUtil; + +public class OCConduit extends AbstractConduit implements IOCConduit { + + protected OCConduitNetwork network; + + private Map signalColors = new HashMap(); + + public static IIcon[] coreTextures; + public static IIcon[] longTextures; + + public OCConduit() { + super(); + } + + public OCConduit(int meta) { + super(); + } + + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IIconRegister register) { + coreTextures = new IIcon[2]; + longTextures = new IIcon[2]; + + coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitCore"); + coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitCoreAnim"); + + longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":ocConduit"); + longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitAnim"); + } + + @Override + public int getTextureType() { + return 0; + } + + }); + } + + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]); + } + + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort("signalColor", (short) getSignalColor(dir).ordinal()); + } + + @Override + public DyeColor getSignalColor(ForgeDirection dir) { + DyeColor res = signalColors.get(dir); + if (res == null) { + return DyeColor.SILVER; + } + return res; + } + + @Override + public Collection createCollidables(CacheKey key) { + Collection baseCollidables = super.createCollidables(key); + if (key.dir == ForgeDirection.UNKNOWN) { + return baseCollidables; + } + + BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); + CollidableComponent cc = new CollidableComponent(IOCConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + + List result = new ArrayList(); + result.addAll(baseCollidables); + result.add(cc); + + return result; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + if (signalColors.size() >= 0) { + byte[] modes = new byte[6]; + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + DyeColor col = signalColors.get(dir); + if (col != null) { + modes[i] = (byte) col.ordinal(); + } else { + modes[i] = -1; + } + i++; + } + nbtRoot.setByteArray("signalColors", modes); + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + signalColors.clear(); + byte[] cols = nbtRoot.getByteArray("signalColors"); + if (cols != null && cols.length == 6) { + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (cols[i] >= 0) { + signalColors.put(dir, DyeColor.values()[cols[i]]); + } + i++; + } + } + } + + @Override + public void setSignalColor(ForgeDirection dir, DyeColor col) { + if (signalColors.get(dir) == col) { + return; + } + disconnectNode(dir); + signalColors.put(dir, col); + addMissingNodeConnections(); + setClientStateDirty(); + } + + @Override + public Class getBaseConduitType() { + return IOCConduit.class; + } + + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemOCConduit, 1, 0); + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + if (network == null) { + for (ForgeDirection dir : getExternalConnections()) { + disconnectNode(dir); + } + } + this.network = (OCConduitNetwork) network; + addMissingNodeConnections(); + return true; + } + + @Override + public IIcon getTextureForState(CollidableComponent component) { + int state = Config.enableOCConduitsAnimatedTexture ? 1 : 0; + if (component.dir == ForgeDirection.UNKNOWN) { + return coreTextures[state]; + } else { + return longTextures[state]; + } + } + + @Override + public boolean shouldMirrorTexture() { + return !Config.enableOCConduitsAnimatedTexture; + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return null; + } + + private static String prettyNode(Node o) { + String at = ""; + Environment host = o.host(); + if (host instanceof TileEntity) { + BlockCoord bc = new BlockCoord((TileEntity) host); + at = " at " + bc.x + "/" + bc.y + "/" + bc.z; + } + return host.getClass().getName().replaceFirst("^.*\\.", "") + at; + } + + private static EnumChatFormatting dye2chat(DyeColor dyeColor) { + switch (dyeColor) { + case BLACK: + return EnumChatFormatting.BLACK; + case BLUE: + return EnumChatFormatting.DARK_BLUE; + case BROWN: + return EnumChatFormatting.DARK_RED; + case CYAN: + return EnumChatFormatting.DARK_AQUA; + // return EnumChatFormatting.AQUA; + case GRAY: + return EnumChatFormatting.DARK_GRAY; + case GREEN: + return EnumChatFormatting.DARK_GREEN; + case LIGHT_BLUE: + return EnumChatFormatting.BLUE; + case LIME: + return EnumChatFormatting.GREEN; + case MAGENTA: + return EnumChatFormatting.LIGHT_PURPLE; + case ORANGE: + return EnumChatFormatting.GOLD; + case PINK: + return EnumChatFormatting.LIGHT_PURPLE; + case PURPLE: + return EnumChatFormatting.DARK_PURPLE; + case RED: + return EnumChatFormatting.RED; + case SILVER: + return EnumChatFormatting.GRAY; + case WHITE: + return EnumChatFormatting.WHITE; + case YELLOW: + return EnumChatFormatting.YELLOW; + default: + return null; + } + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); + if (col != null && res.component != null) { + setSignalColor(res.component.dir, col); + return true; + } else if (ConduitUtil.isProbeEquipped(player)) { + if (!player.worldObj.isRemote) { + BlockCoord bc = getLocation(); + if (network != null) { + boolean noconnections = true; + for (DyeColor color : DyeColor.values()) { + if (node(color).neighbors().iterator().hasNext()) { + noconnections = false; + ChatComponentText coltxt = new ChatComponentText(color.getLocalisedName()); + coltxt.getChatStyle().setColor(dye2chat(color)); + ChatComponentText chantxt = new ChatComponentText("Channel "); + chantxt.appendSibling(coltxt); + chantxt.appendText(" at " + bc.x + "/" + bc.y + "/" + bc.z); + player.addChatMessage(chantxt); + for (Node other : node(color).neighbors()) { + player.addChatMessage(new ChatComponentText(" Connected to: " + prettyNode(other))); + } + } + } + if (noconnections) { + player.addChatMessage(new ChatComponentText("No connections at " + bc.x + "/" + bc.y + "/" + bc.z)); + } + } else { + player.addChatMessage(new ChatComponentText("No network at " + bc.x + "/" + bc.y + "/" + bc.z)); + } + } + return true; + } else if (ToolUtil.isToolEquipped(player)) { + if (!getBundle().getEntity().getWorldObj().isRemote) { + if (res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + if (all != null && containsExternalConnection(connDir)) { + for (RaytraceResult rtr : all) { + if (rtr != null && rtr.component != null && COLOR_CONTROLLER_ID.equals(rtr.component.data)) { + setSignalColor(connDir, DyeColor.getNext(getSignalColor(connDir))); + return true; + } + } + } + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, ConnectionMode.IN_OUT); + return true; + } + return ConduitUtil.joinConduits(this, faceHit); + } else if (externalConnections.contains(connDir)) { + setConnectionMode(connDir, getNextConnectionMode(connDir)); + return true; + } else if (containsConduitConnection(connDir)) { + ConduitUtil.disconectConduits(this, connDir); + addMissingNodeConnections(); + return true; + } + } + } + } + return false; + } + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + if (mode == ConnectionMode.DISABLED) { + disconnectNode(dir); + } + super.setConnectionMode(dir, mode); + } + + @Override + public void connectionsChanged() { + super.connectionsChanged(); + addMissingNodeConnections(); + } + + private void addMissingNodeConnections() { + BlockCoord loc = getLocation(); + if (loc != null && network != null) { + World world = getBundle().getWorld(); + EnumSet conns = getConnections(); + for (DyeColor color : DyeColor.values()) { + Set should = new HashSet(); + for (ForgeDirection direction : conns) { + if (getSignalColor(direction) == color) { + TileEntity te = getLocation().getLocation(direction).getTileEntity(world); + Node other = null; + if (te instanceof SidedEnvironment) { + other = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); + } else if (te instanceof Environment) { + other = ((Environment) te).node(); + } else { + // We have a connection to something we cannot connect to. Should + // not happen. Poke debugger in >here< if it does! + } + if (other != null && other != node(color)) { + should.add(other); + } + } + } + for (Node other : should) { + if (!node(color).isNeighborOf(other)) { + node(color).connect(other); + } + } + } + } + } + + private void disconnectNode(ForgeDirection direction) { + World world = getBundle().getWorld(); + TileEntity te = getLocation().getLocation(direction).getTileEntity(world); + Node other = null; + if (te instanceof SidedEnvironment) { + other = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); + } else if (te instanceof Environment) { + other = ((Environment) te).node(); + } + if (other != null) { + disconnectNode(other, getSignalColor(direction)); + } + } + + /** + * This will disconnect a node from our network unless it has another + * connection to our network. This only works if all the node's blocks are + * adjacent to us. Connecting 2 ManagedEnvironments at different locations + * won't work well. + * + * @param other + * The node to disconnect from us + */ + private void disconnectNode(Node other, DyeColor color) { + + // Um. No. + if (other == node(color)) { + return; + } + // Two conduit networks never connect to each other. They join instead. + Environment otherHost = other.host(); + if (otherHost instanceof OCConduitNetwork && otherHost != network) { + node(color).disconnect(other); + return; + } + + World world = getBundle().getWorld(); + EnumSet conns = getConnections(); + // we need to check if that node has another way of connecting to our + // network. First find out which of our neighbor(s) it belongs to. May + // be just one, may be many. + List toCheck = new ArrayList(); + if (otherHost instanceof TileEntity) { + TileEntity otherTe = (TileEntity) otherHost; + toCheck.add(otherTe); + } else { + for (ForgeDirection direction : conns) { + if (getSignalColor(direction) == color) { + TileEntity te = getLocation().getLocation(direction).getTileEntity(world); + Node other2 = null; + if (te instanceof SidedEnvironment) { + other2 = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); + } else if (te instanceof Environment) { + other2 = ((Environment) te).node(); + } + if (other2 == other) { + toCheck.add(te); + } + } + } + } + // Then see if it still has a connection to our node other than through us. + boolean stayConnected = false; + for (TileEntity otherTe : toCheck) { + for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { + if (!stayConnected) { + boolean checkThisSide = true; + if (otherHost instanceof SidedEnvironment) { + checkThisSide = ((SidedEnvironment) otherHost).sidedNode(direction) != null; + } + if (checkThisSide) { + BlockCoord otherPos = new BlockCoord(otherTe); + BlockCoord connTo = otherPos.getLocation(direction); + if (!connTo.equals(getLocation())) { + TileEntity connToTe = connTo.getTileEntity(world); + if (connToTe instanceof SidedEnvironment) { + stayConnected = ((SidedEnvironment) connToTe).sidedNode(direction.getOpposite()) == node(color); + } else if (connToTe instanceof Environment) { + stayConnected = ((Environment) connToTe).node() == node(color); + } + } + } + } + } + } + if (!stayConnected) { + node(color).disconnect(other); + } + } + + public EnumSet getConnections() { + EnumSet cons = EnumSet.noneOf(ForgeDirection.class); + cons.addAll(getConduitConnections()); + for (ForgeDirection dir : getExternalConnections()) { + if (getConnectionMode(dir) != ConnectionMode.DISABLED) { + cons.add(dir); + } + } + return cons; + } + + @Override + public ConnectionMode getNextConnectionMode(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + mode = mode == ConnectionMode.IN_OUT ? ConnectionMode.DISABLED : ConnectionMode.IN_OUT; + return mode; + } + + @Override + public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { + return getNextConnectionMode(dir); + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionMode) { + TileEntity te = getLocation().getLocation(direction).getTileEntity(getBundle().getWorld()); + if (te instanceof SidedEnvironment) { + if (getBundle().getWorld().isRemote) { + return ((SidedEnvironment) te).canConnect(direction.getOpposite()); + } else { + return ((SidedEnvironment) te).sidedNode(direction.getOpposite()) != null; + } + } else if (te instanceof Environment) { + return true; + } + return false; + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node node() { + return network != null ? network.node(DyeColor.SILVER) : null; + } + + @Method(modid = "OpenComputersAPI|Network") + public Node node(DyeColor subnet) { + return network != null ? network.node(subnet) : null; + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onConnect(Node node) { + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onDisconnect(Node node) { + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onMessage(Message message) { + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node sidedNode(ForgeDirection side) { + return getConnections().contains(side) ? node(getSignalColor(side)) : null; + } + + @Override + @SideOnly(Side.CLIENT) + @Method(modid = "OpenComputersAPI|Network") + public boolean canConnect(ForgeDirection side) { + return getConnections().contains(side); + } + + @Override + public void invalidate() { + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java new file mode 100644 index 00000000..c088ae12 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java @@ -0,0 +1,89 @@ +package crazypants.enderio.conduit.oc; + +import javax.annotation.Nonnull; + +import com.enderio.core.common.util.DyeColor; + +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.Method; +import li.cil.oc.api.Network; +import li.cil.oc.api.network.ManagedEnvironment; +import li.cil.oc.api.network.Message; +import li.cil.oc.api.network.Node; +import li.cil.oc.api.network.Visibility; +import net.minecraft.nbt.NBTTagCompound; +import crazypants.enderio.conduit.AbstractConduitNetwork; + +@Interface(iface = "li.cil.oc.api.network.ManagedEnvironment", modid = "OpenComputersAPI|Network") +public class OCConduitNetwork extends AbstractConduitNetwork implements ManagedEnvironment { + + private Node[] node = new Node[DyeColor.values().length]; + + public OCConduitNetwork() { + super(IOCConduit.class, IOCConduit.class); + for (DyeColor dyeColor : DyeColor.values()) { + node[dyeColor.ordinal()] = Network.newNode(this, Visibility.Network).create(); + Network.joinNewNetwork(node[dyeColor.ordinal()]); + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node node() { + return node[DyeColor.SILVER.ordinal()]; + } + + public Node node(DyeColor subnet) { + return node[subnet.ordinal()]; + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onConnect(Node node) { + + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onDisconnect(Node node) { + + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onMessage(Message message) { + + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void load(NBTTagCompound nbt) { + + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void save(NBTTagCompound nbt) { + + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public boolean canUpdate() { + return false; + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void update() { + } + + @Override + public void destroyNetwork() { + for (DyeColor dyeColor : DyeColor.values()) { + node[dyeColor.ordinal()].remove(); + } + super.destroyNetwork(); + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduitRenderer.java new file mode 100644 index 00000000..172f731c --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduitRenderer.java @@ -0,0 +1,34 @@ +package crazypants.enderio.conduit.oc; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; + +import com.enderio.core.client.render.CubeRenderer; + +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.render.DefaultConduitRenderer; + +public class OCConduitRenderer extends DefaultConduitRenderer { + + @Override + public boolean isRendererForConduit(IConduit conduit) { + return conduit instanceof IOCConduit; + } + + @Override + protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) { + if (IOCConduit.COLOR_CONTROLLER_ID.equals(component.data)) { + if (conduit.containsExternalConnection(component.dir)) { + int c = ((IOCConduit) conduit).getSignalColor(component.dir).getColor(); + Tessellator tessellator = Tessellator.instance; + tessellator.setColorOpaque_I(c); + CubeRenderer.render(component.bound, tex); + tessellator.setColorOpaque(255, 255, 255); + } + } else { + super.renderConduit(tex, conduit, component, selfIllum); + } + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCUtil.java b/src/main/java/crazypants/enderio/conduit/oc/OCUtil.java new file mode 100644 index 00000000..97324fae --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/oc/OCUtil.java @@ -0,0 +1,18 @@ +package crazypants.enderio.conduit.oc; + +import cpw.mods.fml.common.Loader; +import crazypants.enderio.config.Config; + +public class OCUtil { + + private static boolean useCheckPerformed = false; + private static boolean isOCConduitEnabled = false; + + public static boolean isOCEnabled() { + if(!useCheckPerformed) { + isOCConduitEnabled = Loader.isModLoaded("OpenComputers") && Config.enableOCConduits; + useCheckPerformed = true; + } + return isOCConduitEnabled; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/packet/ConTypeEnum.java b/src/main/java/crazypants/enderio/conduit/packet/ConTypeEnum.java index 10986154..9325ac40 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/ConTypeEnum.java +++ b/src/main/java/crazypants/enderio/conduit/packet/ConTypeEnum.java @@ -5,6 +5,7 @@ import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; +import crazypants.enderio.conduit.oc.IOCConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; @@ -15,7 +16,8 @@ public enum ConTypeEnum { ITEM(IItemConduit.class), REDSTONE(IRedstoneConduit.class), GAS(IGasConduit.class), - ME(IMEConduit.class); + ME(IMEConduit.class), + OC(IOCConduit.class); final Class baseType; @@ -30,7 +32,7 @@ public enum ConTypeEnum { public static ConTypeEnum get(IConduit con) { Class from = con.getBaseConduitType(); for (ConTypeEnum ct : ConTypeEnum.values()) { - if(ct.getBaseType() == from) { + if (ct.getBaseType() == from) { return ct; } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java b/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java new file mode 100644 index 00000000..7b666efb --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java @@ -0,0 +1,50 @@ +package crazypants.enderio.conduit.packet; + +import io.netty.buffer.ByteBuf; +import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.conduit.oc.IOCConduit; +import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; + +public class PacketOCConduitSignalColor extends AbstractConduitPacket implements + IMessageHandler { + + private ForgeDirection dir; + private DyeColor col; + + public PacketOCConduitSignalColor() { + } + + public PacketOCConduitSignalColor(IOCConduit con, ForgeDirection dir) { + super(con.getBundle().getEntity(), ConTypeEnum.OC); + this.dir = dir; + col = con.getSignalColor(dir); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeShort(col.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + col = DyeColor.values()[buf.readShort()]; + } + + @Override + public IMessage onMessage(PacketOCConduitSignalColor message, MessageContext ctx) { + message.getTileCasted(ctx).setSignalColor(message.dir, message.col); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java index 0a9c1b26..d3a9a9df 100644 --- a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java @@ -79,7 +79,7 @@ public class DefaultConduitRenderer implements ConduitRenderer { BoundingBox cube = component.bound; BoundingBox bb = cube.scale(xLen, yLen, zLen); - drawSection(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); + drawSection(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false, conduit.shouldMirrorTexture()); if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); @@ -119,6 +119,11 @@ public class DefaultConduitRenderer implements ConduitRenderer { } protected void drawSection(BoundingBox bound, float minU, float maxU, float minV, float maxV, ForgeDirection dir, boolean isTransmission) { + drawSection(bound, minU, maxU, minV, maxV, dir, isTransmission, true); + } + + protected void drawSection(BoundingBox bound, float minU, float maxU, float minV, float maxV, ForgeDirection dir, + boolean isTransmission, boolean mirrorTexture) { Tessellator tessellator = Tessellator.instance; @@ -128,10 +133,8 @@ public class DefaultConduitRenderer implements ConduitRenderer { setupVertices(bound); } - if(dir == NORTH || dir == UP || dir == EAST) { // maintain consistent - // texture - // dir relative to the cneter - // of the conduit + if (mirrorTexture && (dir == NORTH || dir == UP || dir == EAST)) { + // maintain consistent texture dir relative to the center of the conduit float tmp = minU; minU = maxU; maxU = tmp; diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 01efafda..4e9b9f6e 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -390,6 +390,8 @@ public final class Config { public static boolean isGasConduitEnabled = true; public static boolean enableMEConduits = true; + public static boolean enableOCConduits = true; + public static boolean enableOCConduitsAnimatedTexture = true; public static String[] soulVesselBlackList = new String[0]; public static boolean soulVesselCapturesBosses = false; @@ -1157,6 +1159,10 @@ public final class Config { isGasConduitEnabled = config.getBoolean("gasConduitEnabled", sectionItems.name, isGasConduitEnabled, "If true, gas conduits will be enabled if the Mekanism Gas API is found. False to forcibly disable."); enableMEConduits = config.getBoolean("enableMEConduits", sectionItems.name, enableMEConduits, "Allows ME conduits. Only has an effect with AE2 installed."); + enableOCConduits = config.getBoolean("enableOCConduits", sectionItems.name, enableOCConduits, + "Allows OC conduits. Only has an effect with OpenComputers installed."); + enableOCConduitsAnimatedTexture = config.getBoolean("enableOCConduitsAnimatedTexture", sectionItems.name, + enableOCConduitsAnimatedTexture, "Use the animated texture for OC conduits."); soulVesselBlackList = config.getStringList("soulVesselBlackList", sectionSoulBinder.name, soulVesselBlackList, "Entities listed here will can not be captured in a Soul Vial"); diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index 9783fe5d..17a1eedb 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -1,9 +1,9 @@ package crazypants.enderio.gui; -import org.lwjgl.opengl.GL11; - import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.api.client.render.IWidgetMap; @@ -37,6 +37,9 @@ public enum IconEIO implements IWidgetIcon { WRENCH_OVERLAY_ME(32, 128), WRENCH_OVERLAY_ME_OFF(32 + 48, 128), + WRENCH_OVERLAY_OC(96, 112), + WRENCH_OVERLAY_OC_OFF(96, 128), + PROBE_OVERLAY_PROBE(112, 192, 16, 16), PROBE_OVERLAY_COPY(128, 192, 16, 16), PROBE_OVERLAY_PROBE_OFF(144, 192, 16, 16), @@ -134,7 +137,9 @@ public enum IconEIO implements IWidgetIcon { public static final ResourceLocation TEXTURE = new ResourceLocation("enderio:textures/gui/widgetsv2.png"); public static final IWidgetMap map = new IWidgetMap.WidgetMapImpl(TEX_SIZE, TEXTURE) { - public void render(IWidgetIcon widget, double x, double y, double width, double height, double zLevel, boolean doDraw, boolean flipY) { + @Override + public void render(IWidgetIcon widget, double x, double y, double width, double height, double zLevel, boolean doDraw, + boolean flipY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); super.render(widget, x, y, width, height, zLevel, doDraw, flipY); } diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 0efce64c..56ea3cf2 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -159,7 +159,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { riddenByEntity = riddenByEntity.riddenByEntity; } - if(player == null || !player.capabilities.isCreativeMode) { + if (!player.capabilities.isCreativeMode) { if(itemstack.stackSize > 1) { itemstack.stackSize--; player.inventory.addItemStackToInventory(new ItemStack(this)); diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java index 8d6f894a..8ae38099 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java @@ -19,6 +19,7 @@ import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.me.MEUtil; +import crazypants.enderio.conduit.oc.OCUtil; import crazypants.enderio.gui.IconEIO; public class YetaWrenchOverlayRenderer { @@ -89,37 +90,43 @@ public class YetaWrenchOverlayRenderer { } boolean meEnabled = MEUtil.isMEEnabled(); boolean gasEnabled = GasUtil.isGasConduitEnabled(); + boolean ocEnabled = OCUtil.isOCEnabled(); onIcons = new IconEIO[numIcons]; offIcons = new IconEIO[numIcons]; iconOffsets = new Point[numIcons]; + int index = 0; - indices.put(ConduitDisplayMode.POWER, 0); - onIcons[0] = IconEIO.WRENCH_OVERLAY_POWER; - offIcons[0] = IconEIO.WRENCH_OVERLAY_POWER_OFF; + indices.put(ConduitDisplayMode.POWER, index); + onIcons[index] = IconEIO.WRENCH_OVERLAY_POWER; + offIcons[index++] = IconEIO.WRENCH_OVERLAY_POWER_OFF; - indices.put(ConduitDisplayMode.REDSTONE, 1); - onIcons[1] = IconEIO.WRENCH_OVERLAY_REDSTONE; - offIcons[1] = IconEIO.WRENCH_OVERLAY_REDSTONE_OFF; + indices.put(ConduitDisplayMode.REDSTONE, index); + onIcons[index] = IconEIO.WRENCH_OVERLAY_REDSTONE; + offIcons[index++] = IconEIO.WRENCH_OVERLAY_REDSTONE_OFF; - indices.put(ConduitDisplayMode.FLUID, 2); - onIcons[2] = IconEIO.WRENCH_OVERLAY_FLUID; - offIcons[2] = IconEIO.WRENCH_OVERLAY_FLUID_OFF; + indices.put(ConduitDisplayMode.FLUID, index); + onIcons[index] = IconEIO.WRENCH_OVERLAY_FLUID; + offIcons[index++] = IconEIO.WRENCH_OVERLAY_FLUID_OFF; - indices.put(ConduitDisplayMode.ITEM, 3); - onIcons[3] = IconEIO.WRENCH_OVERLAY_ITEM; - offIcons[3] = IconEIO.WRENCH_OVERLAY_ITEM_OFF; + indices.put(ConduitDisplayMode.ITEM, index); + onIcons[index] = IconEIO.WRENCH_OVERLAY_ITEM; + offIcons[index++] = IconEIO.WRENCH_OVERLAY_ITEM_OFF; if(meEnabled) { - indices.put(ConduitDisplayMode.ME, 4); - onIcons[4] = IconEIO.WRENCH_OVERLAY_ME; - offIcons[4] = IconEIO.WRENCH_OVERLAY_ME_OFF; + indices.put(ConduitDisplayMode.ME, index); + onIcons[index] = IconEIO.WRENCH_OVERLAY_ME; + offIcons[index++] = IconEIO.WRENCH_OVERLAY_ME_OFF; } if(gasEnabled) { - int index = meEnabled ? 5 : 4; indices.put(ConduitDisplayMode.GAS, index); onIcons[index] = IconEIO.WRENCH_OVERLAY_GAS; - offIcons[index] = IconEIO.WRENCH_OVERLAY_GAS_OFF; + offIcons[index++] = IconEIO.WRENCH_OVERLAY_GAS_OFF; + } + if (ocEnabled) { + indices.put(ConduitDisplayMode.OC, index); + onIcons[index] = IconEIO.WRENCH_OVERLAY_OC; + offIcons[index++] = IconEIO.WRENCH_OVERLAY_OC_OFF; } int xOffset = numIcons == 5 ? 8 : 0; @@ -139,7 +146,8 @@ public class YetaWrenchOverlayRenderer { private int getNumConduitsEnabled() { boolean meEnabled = MEUtil.isMEEnabled(); boolean gasEnabled = GasUtil.isGasConduitEnabled(); - return 4 + (meEnabled ? 1 : 0) + (gasEnabled ? 1 : 0); + boolean ocEnabled = OCUtil.isOCEnabled(); + return 4 + (meEnabled ? 1 : 0) + (gasEnabled ? 1 : 0) + (ocEnabled ? 1 : 0); } }