From 343f2b277bee48afbd9e0314296927d11b5302df Mon Sep 17 00:00:00 2001
From: Krapht <kraphteu@gmail.com>
Date: Thu, 28 Jun 2012 16:26:50 +0200
Subject: [PATCH] Added void pipes for items and liquids

---
 .../src/mod_BuildCraftTransport.java          |   2 +
 .../gfx/buildcraft/blocks/blocks.png          | Bin 24538 -> 24797 bytes
 .../lang/buildcraft/en_US.properties          |   2 +
 .../minecraft/src/BuildCraftTransport.java    |  11 +++++
 .../src/buildcraft/core/DefaultProps.java     |   2 +
 .../buildcraft/transport/PipeLogicVoid.java   |  14 ++++++
 .../transport/pipes/PipeItemsVoid.java        |  46 ++++++++++++++++++
 .../transport/pipes/PipeLiquidsVoid.java      |  33 +++++++++++++
 8 files changed, 110 insertions(+)
 create mode 100644 common/net/minecraft/src/buildcraft/transport/PipeLogicVoid.java
 create mode 100644 common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsVoid.java
 create mode 100644 common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java

diff --git a/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java b/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
index 4e45798c..692c9578 100644
--- a/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
+++ b/buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
@@ -54,6 +54,8 @@ public class mod_BuildCraftTransport extends NetworkMod implements IItemRenderer
 		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipePowerGold.shiftedIndex, this);
 		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeStructureCobblestone.shiftedIndex, this);
 		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsStipes.shiftedIndex, this);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsVoid.shiftedIndex, this);
+		MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeLiquidsVoid.shiftedIndex, this);
 	}
 
 	public static void registerTilePipe(Class<? extends TileEntity> clas, String name) {
diff --git a/buildcraft_resources/gfx/buildcraft/blocks/blocks.png b/buildcraft_resources/gfx/buildcraft/blocks/blocks.png
index bd4c6560d2d6701711350c266b907141b2bba141..26c5b8f8fba56c7dad5aba4cf17c5c7d862859f4 100644
GIT binary patch
delta 5647
zcmbVubySpH*Y`CbArd2kgtP%jhlJEfd!v97l0!>LD>1-a0}|3GHwe-o($dY4(k0y>
zAPqAL49F1kjqCaE`<}JF^}c^x>+G}7+56hRU1!g=LKfR0@fKIf*=VUCO`{oh6%MR0
z5-y-B1okf#_)PzlgK#`}bcdNf0G6!zOWmj{N7%!d{-$3+Z{$Hd3`+mJBlKINYfv7B
z^CZrhKc@yPS%>>LYw<hhIYl%HlHYu^a=)@Jz|x4SxhaY~D2p2gzrqy!VY+$v;<l`d
zkIsp0qrGNufRcfp?Xc{!V&Es)R<B{KJnQ7-<d&=)cq?7#B&VVl`1lDEAx3VVp57lC
z=I9{z?A;oLTRVycP}U^uEunAq#IkqhX?>JjZoj-Z^Vs^%y@1#)Wq#nq;N<N5dr)Eo
z05ZT!zY>!gDv{Q6@q15_QPrbh*GJwKRX(=v(OeCW1J1f_Q~&kG)RWwnO95NE7?`#;
zEn*lP=3pkZ#B@AFi{kpW`x4uUKPh)xRt&g2-JC)DO9NSGH2e6Mr=3e^e~$~?^lb@=
z8x0K&0IH-!@YQk)`wd?0ZzAAq6M4YuphRzPJ-JQy!n^7t$=9`m^xsd%k>bUSOv9NP
z<@ppYE-o?%%Yc52#baADmN*)MoM7Rta?s?#=9P=Hk%cVeh5K{--k}a}9@v1dNG|7<
zPHT5VD%LKGHf@5<Uul&j6<!n*X~OVVb0bj@*=prILg*H=`MxkQ;g-C3$Z1f{xk<Y`
z>6W}tc>IWFj#g(^dJsd<S&*aar)WB(Aw``NeD4=7Uw$=T7AkjgOAf<ia2$b0uh%Rr
z2-gx`)-aEOxD!*c0N;DVX^JsNN3R#eE*Ro}?xk3}rgLPnwP6)q9z>hlu?D8Gw?s+b
zmS6px2j{f!amn5M5mn_ch{Mas9q&7|MX$<hp%sT?Nz0g4^Ap4W^5-iEQF5Xfr6?id
zW?u;xj}r{FRx}*SCfx#^Mg?j=KG0E_-{&=CTg*RgF)V`%B?%e_<94TQa66NKaAjaj
zjq|ki+3|j|s1=EJ`oqwi9G=&&Ut4Ytr~4lC@m`Nm{XRPzk?Pub)y~cizZ;QJRdt;z
zl)=DY6j94akgAw+_va;eq<%<D4AslmaaN%Pk^?M?&$wY1+3}#Yw|<wGb;`IN7G8FA
zNm4UH^tsfA#=Y^rdf!aWjm`NTJG17I;L}4FoVf5(enVlOp~%{5;4pj30FgN2JiLoA
z^(#&Y#(Ci5_zf%sI8*5a{ek`ceWNCCA?-AoY#|<}SFgTp45dCZF^TNxP<}O24$0R!
z;UKAaIm8+O9?#krl$NSJeM-}UKPwFr1Lw9{S8Y{D5y1+~?;nr|^+aR;X+G_-;9{V%
z`q_I+)bpq2{@NUcB~GR0z{Ir6*x<@e`nGIjOC>)aA52}HynkTenSsINJgZJd^fcU`
z#?R01oq8@GKmQ{xC;*h0HP8<v38{E^h`k(44jLQ;pO`r{_K0o}MvwG<Ap*BBm~I+r
zGtRX?*B0>LR{aEIa`Q&f2*ra4wZ~~>Tz9U{&CiPk;$NpJfgB>}BYGgKxtYz;(a{&b
zo$qnHXIx!f?O;!tChtdIY*^aS6~#14jEtq|otBGZ)4RSH`>@@Y3x6Pujg8P4)$7!u
z)?YwM-Y2C@x4)tdSv>Y@n28^T29;Ph*YE7YXkYUq6k(4r%oa$kt(BUXp1#e?t0AY{
zTv9^K&d%ODG^B<=JnW9+j0+AX0bq|GU!|g=(tYtF+@>d%TR=c-dvEVsSJZOW#l%rE
zre*baR#nxFMRRkRN~IA|GiJpNmEJhh0Pr`m{3UPFBHc&C37$EBJWRru9-5?G-cnyr
z$bIt$mEIyE{Iz9Tz@-!$6;;eBLEfRg%*52HgI<Oc*O9Bq=3EIq4<W5lQEOM4eKJZV
zbQk1Ax@E<jrv#&!#Yl)vu6JO!G^=jG^I9`pB$h)V5|2j+n$<&TXlMXbXE;b_voldB
z6Yxj$rl1k3q@q=Mw<42EL4m!rw6vhKuakY8wR$(-4%>B_pf~DX2?<IAv;#ifb4>}5
zw^Py3CiP?$y%#->B9)+-aW2~hfaSE5AWI!+wmY*$rd&AZkZ1;*zq^~1zCq~D;mU@`
zTD->^#Y2Jv)e0QIkZI!JAW%q9#E|*^?qceit8rF){5Zm>!aB5fWQ56UWAM714~C(v
z1z%*;;F;&USJCtBnn*L(!Qr8rl~uOy(WpjO)rg`%QE@TNv>d`x{!{D%zv7v%;GFii
zG%eoPy^$LfCogk<_on{|SboZ1h+ViQs*3yB|Krc^HQ%)u>G;INJP<8aQe1p(zSgC)
zxU41eal*a!wcid}LH5M#{PN{qz~PXzgR865!($|#ac*udJ|W>P2IE@Ik@<@Ga2ff6
zbZqP#I?C4_%O2G|N3x&bNeZLf&eXgU+~Booz1aBXPdgogE<0V^j;gY<Qq%`yHZe8D
zBPVwY+j1t1T4IWd2H9lkb2Z|^de+)!AKGXU*8Edf^b86V88_$V-1pjiI~lCn2i46S
z+`@NGa*K<#&OR>y?m|i@B=MIil8*F5S5(-KaInd^XHAP#S&?oGr$=3568`aCgX2+P
zpu!SJ2o$;qJXs7s+#Inv-kWuJCI2=ITym}7c;olLf!G(o`rm76Tu|LXq4RGn`J-cF
z!LhNl!~(x+WNIpKj#TnKV%KkQIQ0xs=C-x9g;54sioVn3`;6xDIH`33P^*>VSKdAX
zP;e!;K6+m?yq7fSXRCsO0<+XB=32tG4%%iYoO3Eky#Hv_fk82oPMMM~l0@xUb?f>A
zVmc~kLqXya0@c*gQsHAzzC%Ac9C+d@4^?&u_eG%LA)QtQMO1M;Z{206xe?2Z?mg^2
z)H`$z<rd<Fd{hHU?@Ai{(^tshrw-`v;oGgLYp**=Pu7(@f4+-PG|}<qLe)<F*^SDp
zn5lVF%pItrb?v~@^VJ*i{op(;?vS>xrKS)7^wRo=y8CCg-9Q!}mAC7*f|ytPSl(ar
zi=<t~qM?A$McV4pn`3|Pz3<V{Bb(!^Oi4*3C~x#?W#wmkZX<}%r7ca{C;yD`mgQRb
zb&HZ4k*99OSm0NG_{dfC62GFK=hqf%sp{%Gw$#em@yEcL0kR5yS;|MXRQPpjl>lyv
zfMTD)vmt4kX}|o&xnF_d+rBQwzweHfYua{w^h?HtP&1a?KU;6hFS?)f)huG?Y3lc>
zxyY{db(3kO+qX#<7Z=~D^2~9+tE3;|7goPR|A^R>ZYCu;t;8w)zS6NGdX8+JVy7d2
zt82hG>Y!gdK?GdQjarh?|LOXzyBmzGmrmEjextgmS=_pMs%U^5qWFPB)J(mxa^xq*
zhbZl>Tm&U~uXzR8YH_P`gkLx;hmRPqacUJcOm~R*;*3%Dn`H%#IPanGB%#iNPiHlf
zbV8<Kx_lu%b#Bv`p<SHQHj|J=tfgqd>D|HKhe?7#%h(>%RB7jvDeq~J;~Z1hss`7l
z-4HSko_A|aH@8e8MA{84?#2&7+Y*wJUT&FS7b?jzrzR|WG6~VUil0Jn9S?O63z?QX
z?;4g`Z#T_n>uNe*oH;kxvCdxHRA&AndgQiL*t_`d*@F{jg@`>EkgZFpOzHBDCp`i2
z*+yIript@uzg#<`4&w*eXm5+~QqTwq1(x~7-mSNPrEKMWr<e{6>M2`&)Qaoq|JEU#
z0Ov<YW|t4-aXN6eG3|!rxc#=^I9yKR1mYcsSf^EhVpuVz!k}(`?f18|xR#2Fj#^$z
z406{WS{a<ma@scn=x3GIFd|zy+byAfva-FjSK{Bl&qjv{$bnFp4BHeYpLm>0IED@4
zK0oRk=&Pu?yp*+v0@T>LlM&g3Un;l}*|!{RzmWc2L2xud(vzVp9*lXL^qfcsM_Tt<
zycrwgKq!1UKchoqG&%K<6bO%BCt~Y9V|q{ukhsrRh)F(>D=`vV*D0R|=Mic^o8Hq_
z(QjHHX}puXGUbpQEkGv>j}Fbt3;W0HebaR{iI<j3AMTpWoD=IejJ#4#q-ot-zWP<l
zid!Jrzl;m6dvM|{jyMVy78Vl(cS!9}WoeB;s`kIz30BupauCTG<G#yi0A&bdLjHU>
zl>nJ+kbwhk`C4;8Z-aL!PIt1!aJqM^6;!Y+$WqMI*{vM78((=1>AmAGhA+#<KB)dB
zZV|YIza3jb93O~dfz;2u)_men*eTjk+1B{Scdb<ic%^ZGt&7VdoXkrQilqrJ6iu-G
zD<AJ`WNT1bCA&)Kptt>;4}Gu|NqP>W4iln_wf^%`YzuWGKj>y=jDpflYaNC``E6&-
z2}o5%1<9>j0@WNE-pkwfJz1Y4v0Ga(N!H0R)7X)>kAwo{??HMg+-aU4BK`A43B|X;
zs89t~od*{@FZts8`^#7W*|4NV7r8+XJR=zK2P)X({4hV`^^a{?Ih?{%f&AO+I0*@f
z(b3WDQuBC4l9bEcZGW4do}waf+aG~=mF}AgG}HWmqF9-<VPr7F<r%m7YrH==L)x^t
z-E}DgctX5*v!J~U=v!;zY&*}4ScnnThIyT)KZFde`|MqjOk6I!A^PQ<HiExZrGyPt
z`1KsfnwXrtI-4Vx(w#6K>iJ1`m`YGsL_?H$BKmFGKmR&Ij*9U-?<qkBwRVil{P*u;
z!9AJ2B(rCm4t~k`r#C--yiFhBF#TQU(6~#f-d9ZDpljZ(r7&@Sq57l-KD>J1=|b9L
z+3pC_CcURpIgV;^mnn%suP-$9tc^~Q^wwL7Qf7|WCyVPFJov&GLu^oU{$<nGT9@O9
z&&%h$JQj}Qa;wholapYcxd^fTu=+1@c}|*UNiO0^QC6(aX{C=8sJ)tzz1;S^M=ESy
z2xanYl6hgWTF*bmLS)+az|5XCvFH^$vWic~<06NP4R+UV3R%#qJ^Qs}>c-N2Y=|gK
zT$xOjS_x8%vL3rvnba0}X?Sc$K@#TNWd2mM7iN>e^W?6WA^<i~<&~X_m%ds*D~_KH
zLVcMG_eaASJ|;R^UDMK{(fiP4XO~R)<)fia?5<N%=e@oc3_r&b1u87JpYNY_j6HYR
zsUX(w-&>~7a{{L=QscADPDSRS1+}$?TmF!!fq~J<$vmO&@5z-BKXCIw>o-lgL#*V=
z7ao=r-9JZyN(^d`G&Csm4JI3L`2BChii*r>+dSlEjp1RSYTrD3<f<R3o;&AlCF^>K
zK+i!{pE0QNTrVh!)VyO|?{o1wH;0chymQWbMe|O_e%ld*dX~Elwnwh-&axys%n1yP
z9PqjV)QtFCoVA%1cC{AYGTpu1nva(UI4QZ`I)hhU3;hw`ES1(rp4Lf{Y)oAy(q(G7
zN<cZ4xL=4!0wL6oY@^&R<<?cW@PG{Y%hR$SD=L+n5F@fBbioOY=u@>6hx`4KA$OH4
z@%}eO06<cwPx<g)L6sTU)_SG+#YK}WU0W$!cz$xZHT4i!*!jPh;D5Mx!_Isj@!&l|
zi&k>!5(ZGEt4CHJ^C(1h&$9PTP`1aNr0-_wXm6p-ueBXios&MhB;IVF7hy*tc(cqG
z>XjMk;D;84ScoK}UH4wNxAoQ3NO7BE6}eGqoxaFE3zGv?+{StOmN7C3%<6YLJ|=Bj
z8)_x7l&1q>Va9nn<nxYgIzUMLIdbda5hmQ#yTI;pkl-{7wgqr`tDq7AVZh-LcKe=o
zooZwYM&};lM1{_0hV0x&P3$KjLeKtv4)ei?`wW@wsqtkHA0eKNWC87<C<U3({WpSL
zEv3L?<%&KKVES*wM$QvzpOq`;Z=oianUpIFS3$mzBrr?`El&rtKuT{ywg#{p@<8C}
zVj4x3$Y0+at^0U!pjysdhe^MGTpscR@CScgs*7Y2D$YK?Dnl}4h2XUWxAm4tnfYXB
zx(_Ud)^(CTkB|b~wxR;=gD<mu{UOf-Ie-@=^x{_@*VJW_qoB&9u-?Qr)IOOJ=yme2
zz2|A~WCR`TIsBXL$!$Fy1>D>GO(+VA2PnCT831JklqqQd?vVcoQf5QALcRmU8SVc)
z7N1!0147KYe#rwng_}h3|EmN1FG_6xD!J26%*xgrZ006JS0_*$FF>4oDPfd>|08>d
zI4N0nh}I~Rzi(gC9y|mJ@-Ocz>Y!8r<t@^`Fu?zc<FDL*f!V7Yz6pVPGIst)&y?5y
z(jY!%%Fwu=<P=%2m*CM_oYHagC4P6bzrQ~@tb<K>e14l4^FMR`8Bqt0bR3F`!P%y#
z3r>)>7`PL}vMZ7i0F3*F7-wEF7?v1af8nOiIec;cHa{Oy|0MC5g;koNrg6%`mR*-u
z&PT_*n?O-fk*=|Ep@9=ieyenpJ;R$^-aQC)Lz4auF0tb(co2?JU!H!bp1vh?zp-@b
z-0Y~dE*)MwlbD#8K@=@8-^HrykkgImer@jCSu}*B;jtF!OQr?}jGtSIitcaBc~8f$
zXyXJ7OGNcms}$iZwkFc}6bXCvgwX`7Bb_DR>%+md7x^c450LvK<y&P~b*vPaVz}J6
zgTrSB`GLt?0!6pb4WT|onOiAcCcWG+r*u=p(p*2mozI(AQ}eR5^h2QNk%56hK~YiU
zr=w>ADr>54_Mhn|35RhpC7~*lz@72PRCZ(SGMg#6?cr2YnOXK4XM=r{>Fh69uadkc
zZU(>8cW_~|G01&RSsEEz8kjhTsdQ|KFaFX*0Zjc`bsMeL7=n}9eqI`PZ>K6A?ic7Q
zznN-^Zg9q`j&Qd@eMk%q4G|waK5r|uz6f4Q8;)2i`q0#8u^cG1d)5>?Vd}Ruq!M9^
zJ6P`T|0hl{{YId8tB^QA&Xv+{@5<eRO@7hU5U6dKDEWSO8)sNW?oGbvl+mJuo_)V*
z2xjiNMVUdg+iWir5*+W+zro`+Rc{rX4;}t2B!Yi7)Y+{17yL7?VvM0q%O*M3?9$tL
z&VP7_tq39Hsg`P*n@AN1Dl#8R=Eo>H*~=W+9I77Sed`d8&@Iv|NWCCBoWUvgF>9$q
zPV9tlEbO#v=i$YZ8|qJyWOs_=>fGttf)uHMH1f}owv#@}Ss9XC;TR2NL?EkI+=jjC
z4FCXSAFDpnS5YE!#0VvudRzpcpV;I{-^#H)`YV)meVf;u2XVNX;j8cg8LcDvp5uKw
f_hVwpWDqFCk`9m8LddL$N`S{|+NxibErb6LI2h?=

delta 5386
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
V(RsW3B^H2=`x?6HrK+}}{{biKVMhP}

diff --git a/buildcraft_resources/lang/buildcraft/en_US.properties b/buildcraft_resources/lang/buildcraft/en_US.properties
index f13d5fde..2592e6e6 100644
--- a/buildcraft_resources/lang/buildcraft/en_US.properties
+++ b/buildcraft_resources/lang/buildcraft/en_US.properties
@@ -63,6 +63,8 @@ item.PipePowerStone=Stone Conductive Pipe
 item.PipePowerGold=Golden Conductive Pipe
 item.PipeItemsStripes=Stripes Transport Pipe
 item.PipeStructureCobblestone=Cobblestone Structure Pipe
+item.PipeItemsVoid=Void Transport Pipe
+item.PipeLiquidsVoid=Void 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 65da1841..4e7d3916 100644
--- a/common/net/minecraft/src/BuildCraftTransport.java
+++ b/common/net/minecraft/src/BuildCraftTransport.java
@@ -44,11 +44,13 @@ import net.minecraft.src.buildcraft.transport.pipes.PipeItemsIron;
 import net.minecraft.src.buildcraft.transport.pipes.PipeItemsObsidian;
 import net.minecraft.src.buildcraft.transport.pipes.PipeItemsStone;
 import net.minecraft.src.buildcraft.transport.pipes.PipeItemsStripes;
+import net.minecraft.src.buildcraft.transport.pipes.PipeItemsVoid;
 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.PipeLiquidsStone;
+import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsVoid;
 import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsWood;
 import net.minecraft.src.buildcraft.transport.pipes.PipePowerGold;
 import net.minecraft.src.buildcraft.transport.pipes.PipePowerStone;
@@ -84,12 +86,14 @@ public class BuildCraftTransport {
 	public static Item pipeItemsGold;
 	public static Item pipeItemsDiamond;
 	public static Item pipeItemsObsidian;
+	public static Item pipeItemsVoid;
 
 	public static Item pipeLiquidsWood;
 	public static Item pipeLiquidsCobblestone;
 	public static Item pipeLiquidsStone;
 	public static Item pipeLiquidsIron;
 	public static Item pipeLiquidsGold;
+	public static Item pipeLiquidsVoid;
 
 	public static Item pipePowerWood;
 	public static Item pipePowerStone;
@@ -239,6 +243,13 @@ public class BuildCraftTransport {
 		// Fix the recipe
 		pipeItemsStipes = createPipe(DefaultProps.PIPE_ITEMS_STRIPES_ID, PipeItemsStripes.class, "Stripes Transport Pipe",
 				new ItemStack(Item.dyePowder, 1, 0), Block.glass, new ItemStack(Item.dyePowder, 1, 11));
+		
+		pipeItemsVoid = createPipe(DefaultProps.PIPE_ITEMS_VOID_ID, PipeItemsVoid.class, "Void Transport Pipe",
+				new ItemStack(Item.dyePowder, 1, 0), Block.glass, Item.redstone);
+
+		pipeLiquidsVoid = createPipe(DefaultProps.PIPE_LIQUIDS_VOID_ID, PipeLiquidsVoid.class, "Void Waterproof Pipe",
+				pipeWaterproof, pipeItemsVoid, 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 55dc4f42..ae65a5a3 100644
--- a/common/net/minecraft/src/buildcraft/core/DefaultProps.java
+++ b/common/net/minecraft/src/buildcraft/core/DefaultProps.java
@@ -75,6 +75,8 @@ public class DefaultProps {
 
 	public static int PIPE_ITEMS_STRIPES_ID = 4071;
 	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 WOODEN_PIPE_ID = 145; // LEGACY
 	public static int STONE_PIPE_ID = 146; // LEGACY
diff --git a/common/net/minecraft/src/buildcraft/transport/PipeLogicVoid.java b/common/net/minecraft/src/buildcraft/transport/PipeLogicVoid.java
new file mode 100644
index 00000000..62c5a915
--- /dev/null
+++ b/common/net/minecraft/src/buildcraft/transport/PipeLogicVoid.java
@@ -0,0 +1,14 @@
+/**
+ * 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;
+
+public class PipeLogicVoid extends PipeLogic {
+
+}
diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsVoid.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsVoid.java
new file mode 100644
index 00000000..a9b5408d
--- /dev/null
+++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeItemsVoid.java
@@ -0,0 +1,46 @@
+/**
+ * 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.TileEntity;
+import net.minecraft.src.buildcraft.transport.EntityData;
+import net.minecraft.src.buildcraft.transport.IItemTravelingHook;
+import net.minecraft.src.buildcraft.transport.Pipe;
+import net.minecraft.src.buildcraft.transport.PipeLogicVoid;
+import net.minecraft.src.buildcraft.transport.PipeTransportItems;
+
+public class PipeItemsVoid extends Pipe implements IItemTravelingHook{
+
+	public PipeItemsVoid(int itemID) {
+		super(new PipeTransportItems(), new PipeLogicVoid(), itemID);
+		((PipeTransportItems) transport).travelHook = this;
+	}
+	
+	@Override
+	public int getMainBlockTexture() {
+		return 8 * 16 + 14;
+	}
+
+	//This is called if the void pipe is only connected to one pipe
+	@Override
+	public void drop(PipeTransportItems pipe, EntityData data) {
+		data.item.item.stackSize = 0;
+	}
+
+	//This is called when the void pipe is connected to multiple pipes
+	@Override
+	public void centerReached(PipeTransportItems pipe, EntityData data) {
+		((PipeTransportItems) transport).scheduleRemoval(data.item);
+	}
+
+	@Override
+	public void endReached(PipeTransportItems pipe, EntityData data, TileEntity tile) {}
+
+}
diff --git a/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java
new file mode 100644
index 00000000..c01eb546
--- /dev/null
+++ b/common/net/minecraft/src/buildcraft/transport/pipes/PipeLiquidsVoid.java
@@ -0,0 +1,33 @@
+/**
+ * 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.PipeLogicVoid;
+import net.minecraft.src.buildcraft.transport.PipeTransportLiquids;
+
+public class PipeLiquidsVoid extends Pipe implements IPipeTransportLiquidsHook{
+
+	public PipeLiquidsVoid(int itemID) {
+		super(new PipeTransportLiquids(), new PipeLogicVoid(), itemID);
+	}
+	
+	@Override
+	public int getMainBlockTexture() {
+		return 9 * 16 + 14;
+	}
+
+	@Override
+	public int fill(Orientations from, int quantity, int id, boolean doFill) {
+		return quantity;
+	}
+}