From abe7ef1b6a8c05c0c34bb29cbbd4866bbed944e9 Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 28 Jun 2012 17:25:09 +0200 Subject: [PATCH] Added Sandstone pipe and waterproof pipe --- .../src/mod_BuildCraftTransport.java | 2 + .../gfx/buildcraft/blocks/blocks.png | Bin 24797 -> 25316 bytes .../lang/buildcraft/en_US.properties | 2 + .../minecraft/src/BuildCraftTransport.java | 11 +++++- .../src/buildcraft/core/DefaultProps.java | 2 + .../transport/PipeLogicSandstone.java | 21 ++++++++++ .../transport/pipes/PipeItemsSandstone.java | 26 +++++++++++++ .../transport/pipes/PipeLiquidsSandstone.java | 36 ++++++++++++++++++ 8 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 common/net/minecraft/src/buildcraft/transport/PipeLogicSandstone.java create mode 100644 common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsSandstone.java create mode 100644 common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java diff --git a/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java b/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java index 692c9578..17fab803 100644 --- a/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java +++ b/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java @@ -56,6 +56,8 @@ public class mod_BuildCraftTransport extends NetworkMod implements IItemRenderer MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsStipes.shiftedIndex, this); MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsVoid.shiftedIndex, this); MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsVoid.shiftedIndex, this); + MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsSandstone.shiftedIndex, this); + MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsSandstone.shiftedIndex, this); } public static void registerTilePipe(Class clas, String name) { diff --git a/buildcraft_resources/gfx/buildcraft/blocks/blocks.png b/buildcraft_resources/gfx/buildcraft/blocks/blocks.png index 26c5b8f8fba56c7dad5aba4cf17c5c7d862859f4..f6d2b5e83792c511fea7c4a719b8401e0830f085 100644 GIT binary patch delta 5950 zcmYLNcRW@9|3BC6V?@YaNz}Eo_g;w*BG(nkh>WtwAu_X4B724GkX)`y_TH2&gqyv& zm-{{a{`sB9<2=s$oYy+<=lk_~yu|f|#ZZ$IX;Udfj z-E-8p6$)<$3`0J>wj4Ent!e$R*0$|2x5~A8Ufa_;x!E^ylU=M;%P0wgzoJ(X@;JL8p|3fP%%Z1jo65Yx$|#6D;CQq3@&YI3JT5@RDnT(ZG2y%2um%7kO}j*#ek*i>$Y%C@ z?F6kKi^{*b_z5u3oGG4DF~$VMAZDiFNRDQ5Ny%&;K0Zbk7M69;C3q3b4A?PEZpW1* z7#dbkS6DT?Ml^aa4d<%=M0vr1oVq$jdVYiUcn*2@KB0PUSy>kK2r3v*P*7lVael;n z_ZijYfpX(iNJ5(DbzNPg>a#!PIy(9)0m~0zamrirCh6{bKS)pIZ7Co<586jaNlm3qiYi+7F5ND--d- zEZMO3c8yut4GG${%`{t=%q;eg@l#4pqj3m(R@V&1ihFG%AN+eCR>sx*K5iXzFYrq* zv1W7VsEDge&B(U@GSz8OeG+FCSRaV__g(fFbmG;*-&}wMOb8|?=|jc>opuv0av|Ug z2DGi;<7J83iD27~$(O9ze@C>r7!Upow0*Vj+g;C3`2E4$y7e93y{g~~|F@iqtVM>| zou_-tBa@R6_tT}8Hj1*fxM@`a0^}p8*&=@bw%xkWa5x~|#a+bAY-yRiq`$P+uiM@; zxVZ4<GMvbjrq93p z1F_IO_-(xJyZcl>%U!`EapBpC2S~S)j~+`EFUhwdip-XMlco>c&D*$2${>Kn_^5V2 z_pGIse0X{~hVNd=;!004_C_8GC0B-MysoLK**!4O@x`>%{g3_$4{a=yNGI4DMs9>a z#LYGOEZ1P-M&r)t$p~~s&d*0S{%Sbu-C<4GSok1=pV3}C!HKyqPKmlNsvO1qBDXnK zmprgc??^Kx!ESBH#x#HH>FH55Hom5(r}x0Z;@2E&0$b!nsW~qkPT6WhOG-+rV`xYY zyiZBVtE!?sJ3C8N@DqQRoD6ytURuwk64H|m+BRP0=I0Y5annLP@t8v+P;=&k)OUpN zl6S*myq(cC2N*?k*yN;{{wIkmOu|+zeIghtK;ZUmRW&uDte|5H32Ev4>S`lJ^~LcL z6W^62ZTF2)zS{cwwzY%UA!UNqUM4PUyIHqBn4)qj)`puRdx1+_6O{2+i_<}$J>xt2 zlb+;%Fi_0~+;yuQf=3j`0iaEWO{kDu+LFZ@peIDr3|~Ho11pzRBT(o z*H>+C(!~i>ejPDzaQ5otdi&S&C1b8erS^?ltY8*dcnN(OzwjnuJ(@n`Lo>f{S@R6s zwPGilvUI3FylV8M{mqWaPW2@8d`a|qwRL@{fK2)rIV* z_#pD==x9f0XSJhk!CBdAGc>3+O=Be^39Bn|PRdG(PtLv>HPgwlQ(gif0RdV{CSitOzkb~V8 z4kqM3+6`%Gb3w~m9sFUDGNY-fDGJ9iCx7iI62nKc%^s7I%(FHc4FTQW%;8ilj~8N} zmMk;J%AXJ&nkY6%$pqtNf^jnoH~9E8!64VvslOd4ufJ8Et9oxaM=r}BY+>B$fw6si2N(zmSr;*^`Dq=fW@bD43c1?k{l{77z}ADSyIVp*Vlm%c z8yR*QiR|I}!-eKbm~cJYi;rw;mX_`=J34a=PX^!1S-H5rnOP2<`fFNgEe%-p4WWUX z;&xr}n%>@0-&|)R&;cjjID4~lHOQ>6byE}U#(|r!U~; zD0 z*mkvT=Y;q6?JH^&r-4eR7r{rQ(T}IfiGdX+CMddKK<)X)!JpQRS8ALTHwjyto9!Vm z;;PFN%ns-C!R$(5`}Z4Rt=v|^OyRT-7)WFCiow1BnM?ynkqnq=K*5ukm&Wz zvT)n(GTh-0uI{~(%Us7|U(aksv@NNan=^&42b;HK`po|-QqE}(?kUI<5Cplto@N!I z$RF*Ei04v|1xt0N?fry@wPQi~qR(d&xVs(iBBkKK?qTnf-%N%XBber$-K91)GiM>E zjSWYq|1iyuSixAKou>SI$eEu}WpAnOW$MenY$c-LsannS0RTTzQaL;E(kj}RJe#q{ zbNtT+t*QWGGAfmcPm*8gh;lw>r!1fcgJ(M9z9e}xSUKZ2^KJkSc0MAl*iQsW;6NW& zCG1h)&H;99=Hu<(-Nw1h1SuR90Kdd5)Sk~=UJ!figP0=kqO=-In>IUVf9=-4H%=op z<*C^!ScowTmBFD)cQ8gG1TzNG^wKZmr-X|(u2&liK{(gBASrXx4J9`T z_DUgmvj*$+=(1DstNB@pm#;1C6CzM1a}Lb$*8V!|h~rd)Y&jd+w~=X$voEBtzfZ|? z9$>AN041Ni(2brxGSt&k)7B;@3Jvk6$Sczr+drVAAW2M3jrygj>3o`OsQ9L$LKt$0 zI{EE`vqkSlIx4aWy-f25IW(}^&RiEA(mUARAJ@e{%}29L2Xy7}7bu$t1E);~?AO-J zqw@QD)eb+R*9L+BgCY}GgaZ>}>&{8r@?J4NSnwYYEd|Nqp6|FAz7`)S5c4`boMb}u zJ#|SGmIsdQ9p7$jTY9h~3#~$!w{r34G}A{EkguFfR+?uIY`priv8I3*4OGg;eiZFA z%$B~&nLy4qSz(%8zPjz|yY&&HVWvg)c_=+ne*1eE!X}0AsqpgDKf_5OdUI(((N;o{uBDTqOSxZ5} zfd(Ipnf9tIhQ~URKr~OcWFrL7}f3L~U;AFNZ>*#@C#joPR806c{{}WhHug zyQ^w1vz#1~Xx8W5xLj91oExZ|1P63P%wH_BJQau$Cd^4$>Yao+ESfMNE?>wCZCy&M z^b-9DMRdl&>5TFPcq4CIA)W8%%Py2JJU_>5 zp9N0(CF{YbW?Yj_y-sov&Rv4lntqE`t$5x8IK7;0NJTs>C~b$}7Y*Kjs-G=wNS!VQ zHp@vQ&iVZks<$V2%Lh_9N~}mw!Zf9C4QxxS6I3j?&secuGgMmQJWsRTMP`{C zFUNI2M7)h%pJ@+ibe=P5avHNzdjc9TDiy71lj^nNA!UML4;~$=k zJ$5S@RM>bPH3>5@GLMKsiPv={O}<3MWJG}PvuCEKX`yI7{Ji`!+weYDd^PYD7D$Rd z2o7izC9v@l+$jUHN(dg^4_bcO`EK?2XIdK&e@c?eY4o8@Z7{a7G$}4t2V^76GTp8- zFW15^^Y(Zi`Gu~ch&NisMirKVOyNbms~5@1$xzAsxdM@>M3iPNN9(n0SO0jz2lV!~ zl-rvGe3@E;fyRIzc^&nx0t~=yMLSHo3-)3ra_K%#l`h35JrNfrjBxzq+aWDcPhNnX z)w}zOo_*@Q3A3J${q4@S)<5jUs`XaBMLxafCWzrs3>n^^xmkdhN}27*cw5GcB`dLyHOk8k%Z@QX*HNwlX>h_@+{ zn>Hj*;3ov8GaK99iishQ>yU)x)n$o=*>~4Sh+s#Y(@sh?r#nNLl=U-lJ`2H*g=QL} zXC|x%A-Wf_HnP=8#eld|y=g3@H;GqULzMYp(f%{W>pzyHyv(hEIt z%y;Iye?X6?<4{)jYD;)KWuPi7Ak@)MN;y7M6B{#L(v|Z0)(XhP#9Nu8a#4ns=DBFt z*G`|8p_VyUzPvMCdR;(eU4nbKhQ+ZHf95P=^FsGZlXWFZMVpmkBXj}vBGWQ$<@yX{ zan9SO!RzOicPWDK?VA)-YI-#Z*VE$ymHJbak!vE|aDkA%RpTORjIvJ!3h^j7MJZx% z&;ZI1S3^}mz`BwtR7C|5%Uw^h#>DjZ+kZoM1RwUPcOMy_g>E~wB&P=`^;-zVUv9=y zt3Jc{kRpG`cgd1HJ+ru64+2nP7utR8QM20}u9AwCabv;pe-uLST#CG7@E^Dl8rQ0jqisI&L@?4qD_22!2#EZE(;fLx^W8Lub*F1TKyBnM7J#Q6m_yLD7cdGt< zWMg|HErlYPiqG6#hX{Zh+r=MyzSo1Qauk;Lzq_4wSDk|AAzDh1b#r|ntEb-8vHPH} z$`SlW44jFGP{2^dlF9pziLazY{u^Vz=1K>Bp50Ge`}kzUMw_dG9krIQ6r&}AWX<c?Td zrBk)O!y7TMk@=t=UtNWV3b+&yY38!EFkR*DF|8NqPWbO_w^!`d`Nwz4=1u*o_vR9% z&C<>RXeyDLkriCo>_PQU13kNg9p%p>8jaQV-M+&+Qsz^kc<&q9N0#rip)Y{lr)@*9 z^&#TKC!L3qxQpJ%9ZZN=L#$EFLM0Wu1cjj#-b!o)z9y0}hAwno2EVMvtO~Yttt*KO z%wG)i52LwIt)Ek%oX;jpaFq4lm1dUw6Nz0L$=6yol(G3_)<|32{72|%yuj;K+8hSj z8X$=>Dq8GSsD>ev4)9x#3ZY_m`Auxat)8-bzXorfk4H#va%-)i zI&uxo)}N8DlN8W{i3Tly+pqZUCL=B6UPiovJ$b7h1+bB!DsiLdn*fQ{_7v z7|9?{tapsouXJoYCmhs#REK;*PetvV=UEN0(LjiV)cPG|AaM834nq#^kvs1!hyWkbD8ikZ^}9B?lvTAQ@WLLmyvGfG0=?>Bj%Z4}kO%XY;r406d4VlZ`o&R|LLbm^333%wkz!UzXGL$(@++NRpZ7?%ldfu1!5p?Jo zeZbsi?+-`gU8sb zlvD=p3};|Syvt{*<@%=jF^|1{jHU=Yivz6>uLGbiM)dx^XPq(BWT{CD)NTbI9fm80 z1W&!wLw_^=sd_nVH*!)NuPX1K9P^??I#|T*W=Jdm5UJ>Ds6L#YoY50`ya~x`+uPd@ ze>qCfG(4x#1}mEOuy*B5mS}d&bkMinUOk;4h~AAZ-{xuC!a`k*;?gLspzq?{wbkoI z`f1nRY8zIJajJmpe^|P}O7HAG7d&fEmE#UqtkNXj-qQ8&mxPO8zs{HGf1C*@eX^1S^ywa_2z;L~`V8WNgPZ*OmoDwo7v3GYKQtvi+%MVL}M zq0LG%?kuy}_3p0$T>0|`KJ!0+^lTTKmO4+Mj-`VV?8>JOpD}_971qyF?M6h-IErAn za#&QC9a}6fJVVL2)M3QyTcNZrQ{DUxgxlY+k#oTUb89xv!L#e7^FQnA^Veu|vgKiY zeSI8zGNZLw3(r;E^c}R_%zEs4kTXG2Sl&5p?0~{fXRbz*|CyVgUxRx3V7yY+!u5v# zpdagXaN()&c?*{Qw!O&ezvCovGKL*^MqNgQ`lS$b6Fri|RH`%&@seeP?BV&l#`HA) z9>%U{G+Lgqt@Q*vc3ahuq&dhNF*h?Ki!1jp^Y_eT3-JxOT7CH-&jY17_B;tbZ7XSs z&P`Ye6Ek>exgKT~p)N0#pj8={U@AgQ6a+{BNWGn0kg2X!CeBRMQrlTZI|py$olP+o zt{R4f?P1%th^un15&=apC%|2ig@;nxMpSE=?t^uD=g;L~169@l%1$#Yd8Ei#>PB3I z04EgUPJpAvje=M$H>+9t3hisHrzH6sbQUb{d=FQ!2ZXnCy1gQ6HGKed>1rBiRH)g! F{vS1m!yW(t delta 5426 zcmY*bXE>Z+uz!~*5n>}m3qlH_mnc!AClVw|)YYT+L|N>+M2Rl(CqyTrNAFheHF_tA z&Te8YvC7`fbD#U+et4fVGiPSrGjrxQXMS}>{y;F9= z@zBvdCb|H{WR2fyhE+L&9!7Mx{0jOa591Y~bgw!>yBb}C^3WV7aZbEBHDJjG%*RQS z*D232qKTjU)|1tTm309YhE&Z>QRG2coQkk3jKQB~nny0~O1t=IpV&0oX#@u-=jJ?6}76`v>PDe6N)0kt4mMlhdCeu~7iX05APYjBBWbTF*rv zJWobekAdBvxm#3tZugAks(T!A)a{t~Z#1T!jlr zT>nmgVmt9C2ue7k; zid@jg|JqNna!qH?yxoS8cXt|Gz zKR*sHC3AdW-xj?ltBH~yi6t##T+2@k|0iFlAVkRsqZOhAh|GZkE*{4pY9((loDGt0 zJC5s(U)xFfI*=S-UVO%>cmZa|TY2ksds(GS=we`HN0%fuqr{v`Y^pz)=&$$9 z+#s7TwYFAba%Sc(H@CWsQgcZOH5(gS-|(<19R9c` zjw3EOm;_LK`t&Ll6_w8G*WuQ^v7CH-nmhaZUENVDSr?N>$>^4~KUq~(He{E09zUpi=#R(VT(Jt6nqJ7ju`kl^>089tX% zOjJ}chZuQ>)(RtIt2Sx{MqEd)CY#+!=zR=njfz^o((IE_DyFk2Bh(`;;xx@4%_KrX zY;t{rd!<=*i=Nk-VM4L&a*=pEoZqw_N<%{fAi>UXTI=1(LaBhi!ngPhktG$aN_!QV zcjV;QN=r)%O8Yz6CRnQX@@+BQrwO`a?v;?BG(aoh%LCVx09jjQbuCg)7U2ic6G&1q znpvl^JpfoqO9`^jhGx4nnP@1JhQ?)e%g)u&G*3@fZc`$k6@y*7t#$oQb?%UbY7h7F#1zWWuuUDt$~ z?;K*Ws+N}7zDHx~-BqLVd_~2@G&3@A3)wHRi@fq@zWnoAU1^%!vHPPpDNf$x{^?8q z8?f?%w-B> zc#U zAMelEJIlTg1D9RvH{ba^vUdiZyXya}tKNa?3<;cfG3Sqsj|a!bUMB+ls-cMq-#J3T z`-n}i!T!`UM2XYJ#zv7c$U^vo4$oKA9gmY*7XZ0dDSGAo695TQaOwWJoMa>CcVQ}wd^P%3QwJ$dpE##pZRQOQR z;Ge!q4m-6+{RrP_OJw2V@ zi5>*!X>x|NeJ?cuA%K_WGwPmS*|vjOJXGGUJ8~jk?c;g>j$b6{G9C>D1TNCnmfs!w zd++~eH+P?T_Oth@j!fu$C+>AVRE5-o72f|0M zqLz8({XD<7SV>e@-?O1s%8ow<*7Xrpu**^&s^!A()8HCmO9&MC3Z4y1(#-hfH_rbK z4Bzo}G5T|Vyj;Vk`?Fs%E`*w)oglJ`FkCGhB14+;z?q_)tty> zDZO8=U0_d7WW8j%2BwSZqGoCP>Z!awVwmD54qh|;&eDNbDH}?(_Esu_l6=&-f@n2o z?HuJ549npm-q!@RvMRbKM09D^F#Fw#9DAJiaCnkHXTg`V8gW_ylQ12g5T81?8T9ZT z&T)rPz&zGMxZw2u&>w6Pf6xl1*CbWa>0}!8o?$;n*R`s`w61Ro7zHo5wWga{BoQKQ zhnM!^hoEfEf@AJeR%ok#7Qn9#5fBJ0^Nqb3y%576s}mS$@`x>loxn6qP7k~n~Phhdf(WuREG7+s-Xx3K=FD=n_2qN1ag+X9W)^M_Ujr!t@Rj{>kuJC|^*IE4H9q<^r#qUQ2a+71d( zW9m*ur4xQD<3^?5v$y?5_;&}vPy}&L`tEoz=6%vDA{`uQ)o1>0e4HIF_wD?Q7KPT} z&_z(dJ$|2vZ1{}pLMcEZpD!1ad?-_5D6*klz5p)3Re?6$7p=lzmnLbvqpT9;u*`LU zRuC2)nwJ;$%=BZ^4OOu>7R#UR8_%8-@f${7DI?Uh;VoP3oU-Z`NcJDYqU%14sKp*f z!OYBT4Cf4~9j+{`(NER-ZzsX>22uthK5Nu}84Vx}fK15WPp4uaqctLM&@Eqc9_VZE zF2(6gwHVCwf!nQe76n=Inc91mgZJYruOYm5{YCI)`Itx5zeUXhm+^OFONiqGaV(Jd zmDie2911&yJ1W~6|N5@CY6H&dhnTv!EW*ix7@=5_@LJv&GqC#kp?bDDrDd|Km^Nz1 z&k5^;sYuebAG4nnUaIw9khr~AH~N!ycGfT`-J}+@ACcX0(wKx)RaB6$vhr24t9!5P zJoIFFg}`iYD~hvBjhn=dzJDSRDEk1?N8wKM3XAa17bX zi{9RSX~;~xQ7uKU)AYxX;SHbtE8>YOg*S!2onMdOZB;J0jV%0r4rEPEO6tzenC|6D(Tim5e zVo)24O}*=5({5g6wOaz_*HvHsUN&)K?m0Gq7bdPwrAn*@sYY3iKd4M< zi@Y>Awxu8mb80esq0y&kox%0|z6dA}G*RW1or{(_Z=4m!&jlgBO@;fTVDz689W1YD zYSQR_>bA8_Cj9nMS0i@UX^Hbb-wXO*gdZWI(nYTUD` z_qlkRo5MpH-Z}5Rs&TL5pzR1kJ;&LmxKFO<&b%x=!T}799&)<^)C~AsoRz61W~~YJkSCuQbAckbisDcw3;TNhY_74ZdL+&e8;{9(40f4x6zY_L8e&t!k z?Tt#ai;E^{+O|@d;KI~OYbq94-2Hz-@c*Ru!_Iu3aN#{di&k@K69$o`Ye$x!^C*OM z&aw}Tkv7Mjq#x#Jud|}euC*Ojos+)2Bx<%V2(cmH+*xLe^-2u1FsykY1|rU2+p{0; zZFMy@Qq=lbS!PU9yFaqu-1txhw|SnvZG=byvj*Ibk4f9shg(T3Kv`PFFrz$e@&$)B zZ6GB69I^fQ2p#U~U0{1TL~tAd+XC)*DLUIH?!^Irs;YD$5}>J>d8z~sM(&79}d zKC4&G-$RWrGbvZW#j89aNnn^Vig*xngya@vdl0iJ3k04nrBP%F{ma>sfA}w@ItWIA;_UOQQY6EcaBd55M|YW&iARd2=g@q3Lp$l~C@H{cBh2SM z^d`&KAMz@Y9e7PbCwk>+O zN~uU0n6L~JU?=*gWZwNP3n-C)Y+u$I!U6^Pmk;H&k;;J5HfchfIYUA#jFRa3CPSZ2 z_!b1}$aXUDbikVj@IK8j+-y>dt(Cw1Ib|>w*@B_c8KZu zJMW(nb?89LE-xRPZF0Kk2x*IfIYKPDBN+g|sDGGY)|uX*#PG&zH#Lrti}UyS`H=eO zi7(A9(+o6>QWm#uyS;KgJLKI0ii(PKjEoBP9hvi6CBY~=`ggh9`w;4eB)wf+V#n3P zaJ1UW%wx6mZGnf4rOW50N2PV?u-e(g#Ka7uX@S`uMopWXc2wtkbN}v=0SpC;HBVnQ z(bs4A+EP^XaC6>!CVo{5$7fI?tfx{X4`a45mc*xs*{LOrC14zAEqLByht^-`pV&S^ z9E_HO+hrIvj0Bisu+q4T!)FKiCEwvIVnsEC`V?hur*s?laVk2dn;4Yl`tk36-Ljls zkgla028ECG_4NyiiXy)pz2s9~S8=oZN;gHo#>JF`Do+9TCL&YWjI_$Er)73VQca}h z*lL{g4~%EBzhS&e@}9ft|4HA)h0Vnv4mdz*8YvqZMNxJW$=DKK{H3v6>i4R+Xg?ErUeyk9*(_ z&Y+6in|#SJqeTHV_i@W0bKfn>6r$B;bD5CfaG&lS9=D~!T5vv${Z&W|{^f9Iv&z5V zUwRdz4YXUf$nVT8zhB^Z#zjOeT)lj_|&9a0lo% zX%?iO9~DmTnERBa)IKM6(ie=$ydFYkNpu1{Rn=1Yu0&!H{67#^#*6>} diff --git a/buildcraft_resources/lang/buildcraft/en_US.properties b/buildcraft_resources/lang/buildcraft/en_US.properties index 2592e6e6..c368194b 100644 --- a/buildcraft_resources/lang/buildcraft/en_US.properties +++ b/buildcraft_resources/lang/buildcraft/en_US.properties @@ -65,6 +65,8 @@ item.PipeItemsStripes=Stripes Transport Pipe item.PipeStructureCobblestone=Cobblestone Structure Pipe item.PipeItemsVoid=Void Transport Pipe item.PipeLiquidsVoid=Void Waterproof Pipe +item.PipeItemsSandstone=Sandstone Transport Pipe +item.PipeLiquidsSandstone=Sandstone Waterproof Pipe tile.miningWellBlock=Mining Well tile.plainPipeBlock=Mining Pipe tile.autoWorkbenchBlock=Autocrafting Table diff --git a/common/net/minecraft/src/BuildCraftTransport.java b/common/net/minecraft/src/BuildCraftTransport.java index 4e7d3916..1c6a87d3 100644 --- a/common/net/minecraft/src/BuildCraftTransport.java +++ b/common/net/minecraft/src/BuildCraftTransport.java @@ -42,6 +42,7 @@ import net.minecraft.src.buildcraft.transport.pipes.PipeItemsDiamond; import net.minecraft.src.buildcraft.transport.pipes.PipeItemsGold; import net.minecraft.src.buildcraft.transport.pipes.PipeItemsIron; import net.minecraft.src.buildcraft.transport.pipes.PipeItemsObsidian; +import net.minecraft.src.buildcraft.transport.pipes.PipeItemsSandstone; import net.minecraft.src.buildcraft.transport.pipes.PipeItemsStone; import net.minecraft.src.buildcraft.transport.pipes.PipeItemsStripes; import net.minecraft.src.buildcraft.transport.pipes.PipeItemsVoid; @@ -49,6 +50,7 @@ import net.minecraft.src.buildcraft.transport.pipes.PipeItemsWood; import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsCobblestone; import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsGold; import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsIron; +import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsSandstone; import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsStone; import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsVoid; import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsWood; @@ -87,6 +89,7 @@ public class BuildCraftTransport { public static Item pipeItemsDiamond; public static Item pipeItemsObsidian; public static Item pipeItemsVoid; + public static Item pipeItemsSandstone; public static Item pipeLiquidsWood; public static Item pipeLiquidsCobblestone; @@ -94,6 +97,7 @@ public class BuildCraftTransport { public static Item pipeLiquidsIron; public static Item pipeLiquidsGold; public static Item pipeLiquidsVoid; + public static Item pipeLiquidsSandstone; public static Item pipePowerWood; public static Item pipePowerStone; @@ -249,7 +253,12 @@ public class BuildCraftTransport { pipeLiquidsVoid = createPipe(DefaultProps.PIPE_LIQUIDS_VOID_ID, PipeLiquidsVoid.class, "Void Waterproof Pipe", pipeWaterproof, pipeItemsVoid, null); - + + pipeItemsSandstone = createPipe(DefaultProps.PIPE_ITEMS_SANDSTONE_ID, PipeItemsSandstone.class, "Sandstone Transport Pipe", + Block.sandStone, Block.glass, Block.sandStone); + + pipeLiquidsSandstone = createPipe(DefaultProps.PIPE_LIQUIDS_SANDSTONE_ID, PipeLiquidsSandstone.class, "Sandstone Waterproof Pipe", + pipeWaterproof, pipeItemsSandstone, null); // dockingStationBlock = new // BlockDockingStation(Integer.parseInt(dockingStationId.value)); diff --git a/common/net/minecraft/src/buildcraft/core/DefaultProps.java b/common/net/minecraft/src/buildcraft/core/DefaultProps.java index ae65a5a3..13ea1f96 100644 --- a/common/net/minecraft/src/buildcraft/core/DefaultProps.java +++ b/common/net/minecraft/src/buildcraft/core/DefaultProps.java @@ -77,6 +77,8 @@ public class DefaultProps { public static int PIPE_STRUCTURE_COBBLESTONE_ID = 4072; public static int PIPE_ITEMS_VOID_ID = 19150; public static int PIPE_LIQUIDS_VOID_ID = 19151; + public static int PIPE_ITEMS_SANDSTONE_ID = 19152; + public static int PIPE_LIQUIDS_SANDSTONE_ID = 19153; public static int WOODEN_PIPE_ID = 145; // LEGACY public static int STONE_PIPE_ID = 146; // LEGACY diff --git a/common/net/minecraft/src/buildcraft/transport/PipeLogicSandstone.java b/common/net/minecraft/src/buildcraft/transport/PipeLogicSandstone.java new file mode 100644 index 00000000..706ba10c --- /dev/null +++ b/common/net/minecraft/src/buildcraft/transport/PipeLogicSandstone.java @@ -0,0 +1,21 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package net.minecraft.src.buildcraft.transport; + +import net.minecraft.src.TileEntity; +import net.minecraft.src.buildcraft.transport.PipeLogic; +import net.minecraft.src.buildcraft.transport.TileGenericPipe; + +public class PipeLogicSandstone extends PipeLogic{ + @Override + public boolean isPipeConnected(TileEntity tile) { + return (tile instanceof TileGenericPipe); + } +} diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsSandstone.java new file mode 100644 index 00000000..bcc35b25 --- /dev/null +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package net.minecraft.src.buildcraft.transport.pipes; + +import net.minecraft.src.buildcraft.transport.Pipe; +import net.minecraft.src.buildcraft.transport.PipeLogicSandstone; +import net.minecraft.src.buildcraft.transport.PipeTransportItems; + +public class PipeItemsSandstone extends Pipe{ + public PipeItemsSandstone(int itemID) { + super(new PipeTransportItems(), new PipeLogicSandstone(), itemID); + } + + @Override + public int getMainBlockTexture() { + return 8 * 16 + 15; + } + +} \ No newline at end of file diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java new file mode 100644 index 00000000..cb300527 --- /dev/null +++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsSandstone.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) SpaceToad, 2011 + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ + +package net.minecraft.src.buildcraft.transport.pipes; + +import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.transport.IPipeTransportLiquidsHook; +import net.minecraft.src.buildcraft.transport.Pipe; +import net.minecraft.src.buildcraft.transport.PipeLogicSandstone; +import net.minecraft.src.buildcraft.transport.PipeTransportLiquids; +import net.minecraft.src.buildcraft.transport.TileGenericPipe; + +public class PipeLiquidsSandstone extends Pipe implements IPipeTransportLiquidsHook{ + public PipeLiquidsSandstone(int itemID) { + super(new PipeTransportLiquids(), new PipeLogicSandstone(), itemID); + } + + @Override + public int getMainBlockTexture() { + return 9 * 16 + 15; + } + + @Override + public int fill(Orientations from, int quantity, int id, boolean doFill) { + if (!(container.tileBuffer[from.ordinal()].getTile() instanceof TileGenericPipe)) + return 0; + + return ((PipeTransportLiquids)this.transport).side[from.ordinal()].fill(quantity, doFill, (short) id); + } +} \ No newline at end of file