From e6935ed859e282f358b12d99ec5730c9853eba66 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Tue, 29 Oct 2013 04:05:59 -0400 Subject: [PATCH] Fixed a few issues with pipes --- .../assets/fm/languages/en_US.properties | 18 ----- .../fm/textures/models/pipes/OilPipe.png | Bin 782 -> 0 bytes .../fm/textures/models/pipes/SteamPipe.png | Bin 1906 -> 0 bytes .../fm/textures/models/pipes/WaterPipe.png | Bin 791 -> 0 bytes .../fm/textures/models/pipes/bronze/Pipe.png | Bin 0 -> 820 bytes .../fm/textures/models/pipes/copper/Pipe.png | Bin 0 -> 820 bytes .../fm/textures/models/pipes/glass/Pipe.png | Bin 0 -> 843 bytes .../fm/textures/models/pipes/gold/Pipe.png | Bin 0 -> 829 bytes .../fm/textures/models/pipes/hell/Pipe.png | Bin 0 -> 828 bytes .../fm/textures/models/pipes/iron/Pipe.png | Bin 0 -> 808 bytes .../fm/textures/models/pipes/milkPipe.png | Bin 816 -> 0 bytes .../fm/textures/models/pipes/obby/Pipe.png | Bin 0 -> 829 bytes .../fm/textures/models/pipes/steel/Pipe.png | Bin 0 -> 810 bytes .../fm/textures/models/pipes/stone/Pipe.png | Bin 0 -> 820 bytes .../fm/textures/models/pipes/tin/Pipe.png | Bin 0 -> 829 bytes .../fm/textures/models/pipes/wood/Pipe.png | Bin 0 -> 827 bytes .../fluid/client/render/ItemRenderHelper.java | 3 +- src/dark/fluid/client/render/RenderPipe.java | 57 ++++++++-------- src/dark/fluid/common/pipes/EnumPipeType.java | 18 +++-- src/dark/fluid/common/pipes/IPipeType.java | 2 +- .../fluid/common/pipes/ItemBlockPipe.java | 2 +- src/dark/fluid/common/pipes/PipeMaterial.java | 32 ++++----- .../fluid/common/pipes/TileEntityPipe.java | 64 ++++++++++-------- 23 files changed, 95 insertions(+), 101 deletions(-) delete mode 100644 resources/assets/fm/textures/models/pipes/OilPipe.png delete mode 100644 resources/assets/fm/textures/models/pipes/SteamPipe.png delete mode 100644 resources/assets/fm/textures/models/pipes/WaterPipe.png create mode 100644 resources/assets/fm/textures/models/pipes/bronze/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/copper/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/glass/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/gold/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/hell/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/iron/Pipe.png delete mode 100644 resources/assets/fm/textures/models/pipes/milkPipe.png create mode 100644 resources/assets/fm/textures/models/pipes/obby/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/steel/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/stone/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/tin/Pipe.png create mode 100644 resources/assets/fm/textures/models/pipes/wood/Pipe.png diff --git a/resources/assets/fm/languages/en_US.properties b/resources/assets/fm/languages/en_US.properties index af6746821..8fc499c83 100644 --- a/resources/assets/fm/languages/en_US.properties +++ b/resources/assets/fm/languages/en_US.properties @@ -66,24 +66,6 @@ tile.FluidPipe.2014.name =Mangenta Stone Trough tile.FluidPipe.2015.name =Orange Stone Trough tile.FluidPipe.2016.name =White Stone Trough -tile.FluidPipe.2000.name =Tin Pipe -tile.FluidPipe.2001.name =Black Tin Pipe -tile.FluidPipe.2002.name =Red Tin Pipe -tile.FluidPipe.2003.name =Green Tin Pipe -tile.FluidPipe.2004.name =Brown Tin Pipe -tile.FluidPipe.2005.name =Blue Tin Pipe -tile.FluidPipe.2006.name =Purple Tin Pipe -tile.FluidPipe.2007.name =Cyan Tin Pipe -tile.FluidPipe.2008.name =Silver Tin Pipe -tile.FluidPipe.2009.name =Grey Tin Pipe -tile.FluidPipe.2010.name =Pink Tin Pipe -tile.FluidPipe.2011.name =Lime Tin Pipe -tile.FluidPipe.2012.name =Yellow Tin Pipe -tile.FluidPipe.2013.name =Light Tin Pipe -tile.FluidPipe.2014.name =Mangenta Tin Pipe -tile.FluidPipe.2015.name =Orange Tin Pipe -tile.FluidPipe.2016.name =White Tin Pipe - tile.FluidPipe.3000.name =Tin Pipe tile.FluidPipe.3001.name =Black Tin Pipe tile.FluidPipe.3002.name =Red Tin Pipe diff --git a/resources/assets/fm/textures/models/pipes/OilPipe.png b/resources/assets/fm/textures/models/pipes/OilPipe.png deleted file mode 100644 index 0f34b76da6bb0f6ec97014f5c98a31efaed13847..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 782 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 VQv-q^vG)J~002ovPDHLkV1fs?P%8ic diff --git a/resources/assets/fm/textures/models/pipes/bronze/Pipe.png b/resources/assets/fm/textures/models/pipes/bronze/Pipe.png new file mode 100644 index 0000000000000000000000000000000000000000..b10e7382dbeb866c2b7ce2ca63440c503efd0bdf GIT binary patch literal 820 zcmV-41Izr0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00N{*L_t(|UhSH{iWET*#(QS>ZWm7!6BDyL z3~N z@91M12k3RMhE+{ciZ!lo-BDJ{gd$}Pu=2lv(3lU3-!xn{=s5tf`ShR4db`WG&%$}+#2RRpk}B)fnt@2mb`PwfoP z>SRNMV>|~iHrTtcxb}>9@&z|!Ry$6TB_I|lmH_U8ZXIa(FfJVXzOohpl#p5g<~k0a z_xSA>_37E6y8Y^hI=X*Z-Fbby$Xr%jQIA#$pltHZeZ33jF2qcP>o<#A0HJA(05~ST ziYpiYiU78mx-Wj#;kqm|O#qd<0C*U)3GE|$a$}#>0b;7xL>yo< literal 0 HcmV?d00001 diff --git a/resources/assets/fm/textures/models/pipes/copper/Pipe.png b/resources/assets/fm/textures/models/pipes/copper/Pipe.png new file mode 100644 index 0000000000000000000000000000000000000000..6bd0cac59af8f7a5221f050edd8744ea5fff9392 GIT binary patch literal 820 zcmV-41Izr0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00N{*L_t(|UhSH_Zqz^!$Jf3~?jQ(6K^nRs zN(zv85E>8<0CW)z4N{sQrH&8{NYoS*)I0-%h7u9c&_G2RNbZZ9mFKiK+Vy$Qv%6<| ze$r^|k{k^AKm;dO)cisAceXU}hb0byzpw#Iz z1oS>QuP-m!=zy52m=Km^0uVNX9MTKgx|qLz_vE^6g=S#Q05G?khPeC)h~Vq5VX+s6 z7mqV-0uR~YBef_3IXHM@KV6*+V{+y0Q+57h-`WoqhE1eZz}my?12Wsg*FTHBxX`g{ zToK3>eBjTg<6>)>vOZjerOS_Cw&A?~O(RMM2$8aBKM*7uM9csj{*X&UZh`q+tE>V# zP7dnkG@)56Wq><-m$gx--*sF{Y-tZtIZfw4RXQ*B_|7 zzooaSAE3v<99A|+DdxDkb%(8%2}Q~pVClbr(3m%h8RW~!scz{$0KVDeTxGrOh2Q7q z))hg_-~*fj@Xc0H1%S+^V>KC_Dd^gjRWS2RCnN3aZ4XtJ`PHlpqeJMk7yr+ghn#JddPc#j?)?e(7&b8VgOG) zS`0Wpylu@C0MG#VE&(a7dx;fj7o1ZBs{m34pF(Q_yf$BdRk%e_7G%y3R9h>6RG31b yL8KyyS?swG0dyQ$1#}z{K*wPdfTaH>qSSwkw49!kPUq(U0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00O&7L_t(|UhSH{ixe>w$KTBE-5#FJ6&`{J zf~at6ah>4e|8OAwC~URTRuF6jTeUg=0TGLhE9OJ0)tS8W=MG&h2U;Y<2=gaQe<` z*(-;apMQzM_#xTdKbS27eQ@{u3E4VIkqo2q{@q8|xPHs%M;C@kq8G@ez8cvF;_gR=~k@R}K*%a_|@4l!{?mQPYq1$c8 zA*S>bVhTWf`!V?_gP2pmY%6#?9KdLJD2%Ok2h#S6XzO-FKMn^l&uNSS78OIN;3G>R zfDoty&68EoHW~eaq_sM;y9{no5rhmr;!^-F*9QqI0Aey8!f0>^=-QT5DD#X*17T~e zu0fKxtyx(B*+h8?NYXa6JL|Brc3cD-3%03`kgc=6F+KK}bMTpb@KtR%QKo=U#Fzqn zFX*zMl#hO~?Yd>n0x%F;0O~xB=exLd3En>5h8xemz?%o>;O2{O)5sG2F_6wWKo4;8A%S_RYpDglD3sn=q+@}D%sA^&AN3ah< z%7!z*V(>md!>Nq`Os}S~gaGe)Dk1Rs;cacE07MUf=`$}EY-0%(Xd6DK2(JQ&8GIdm zO+f$6)t(pMqL>$CpC72!RsgY3g`fvf7fHy)o(&d2!{MiZhQk7AINk)n>A#8q`~_=r Vwm|z}0L}ma002ovPDHLkV1kjrdJg~q literal 0 HcmV?d00001 diff --git a/resources/assets/fm/textures/models/pipes/gold/Pipe.png b/resources/assets/fm/textures/models/pipes/gold/Pipe.png new file mode 100644 index 0000000000000000000000000000000000000000..b6461dbf8d8a0e7e63c5bdad75b23121517fd4dc GIT binary patch literal 829 zcmV-D1H$}?P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00ON^L_t(|UhSH{Z`3dp$6xNQcZC8Kq8lSZ zEG#Vi1xzf61=PQQt{M$!YMb4}T$#6JatO2O764RG$St#N5Z&{G2 z=X84xRYhHAGWbAm4`ut3`R7Zt0x%2=Rin@KufV~bqkKP_sMI3WmBrd4;{zkx?(1WD z6&9ZY2(kvCZ1CUHU$V4Jkq^_t(qvzNf=bij{cFrK<_86!4`S)|)zW_W zdEuKhyS)K)dK;pw+Y$XfbXepx$_v&NL!iM&qV$hs>9+viWE*A^ zRnRt{o?FYHd8RaFE52OpsnfNNbr1)!MECNLeJ0J=6s6%~1A)3LC1`~q>0J3#p`SIQp`1JG^Jb3vH-tAq7hp&F5BbUfK>d`0x%|@2=NX_fJ*Q=K+9=N z1Tf7S*Ij^-g7>1Hv1Rp9{ynWZpMVs-<7yAS;ax(8=sYO>(+VKs;QxodCQxm2wObN0 z3aoAfSS0~OB0F&UAeLRnfCbQUco)!eSO6`DP5>PK*ARezwPl0J5kk_N00000NkvXX Hu0mjfQuA(! literal 0 HcmV?d00001 diff --git a/resources/assets/fm/textures/models/pipes/hell/Pipe.png b/resources/assets/fm/textures/models/pipes/hell/Pipe.png new file mode 100644 index 0000000000000000000000000000000000000000..9feeb8d92a2a099941885eb72882924155000682 GIT binary patch literal 828 zcmV-C1H=4@P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00OK@L_t(|UhSIAYTG~%$4CB%L!CZ{QO_E+VS|WXlBu(FQaY$EI?9rM|IOPMq77^Y(N}oBSOT~(vZ%640KLy( zX(%h|HZ1{Be0snu08L`nahMF}pJ4QGwK|R>DymUzS=2hI80c(ou7Alhw^S(rCp7?D z@{x~UWGBnX(Z1|0g9%L^gl>ER3Mx7BK6}$~;{c|1Z-WvClXP*|muGVdcQ1zHC%0p` z_;hU2dl9%&eZc{8@#z2=0qnn@Z{hB~Ws4nkT=zP}mjDFZaaP5s z0Ivd|CxNrc7^ahZG1%=5pwpY*P3kzJz78jl7u3rH*A;`KD6| zb+;DdHj^tY0*A>*I0ayJeG;4sfQV-kn2zrOL+f0HoM$#2i?Qz3HbjwS%^Czyh?iYJ z)agNQFogd0jz~5h*r#)Z#sKE}nq?IY{p z05t>?Ne6QL?){_vLXv2%y$*KLu1VtP3_x0QoflUexpvXdKRd5K=k80ZI{e0WGI74xqd9 zY!_@lfQ&o6VP|F9XG_K3)I&E z>LdV9q=ld+amk?^7JE8^09sDi1+<(XfR@82fMEX{2*4wS-Gf2|H^C|Z0000lU literal 0 HcmV?d00001 diff --git a/resources/assets/fm/textures/models/pipes/iron/Pipe.png b/resources/assets/fm/textures/models/pipes/iron/Pipe.png new file mode 100644 index 0000000000000000000000000000000000000000..a408ad4c000328c50347f65c7e893c419f0e6690 GIT binary patch literal 808 zcmV+@1K0eCP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00NjvL_t(|UhSH{kJB&|$DOp--f=J>CUi4m zx#eamrtWMY{s6>w@DH5YzX7oz{(u{9VnpiJ{s}Ayi48F^F`&EtqR+~!T+2?K z_mM0oPl=!7_sz58Hd${F8RPL-*2CdY*2rWsk+sc^_Z7kQo-%DCW$&%x(+7HgDEpUY zb#OpTE`{++GyyR6Acb^-r7Y_G*Kf~c%^U{C3;=VxS`eEZ0TFzE{3bi|!)!K_g`pvt zPN&;NAO(ZLAUoQnN`_H6={*w9o?jUK=)y3G)CF97s6HUGz5etoI}3|Gc2r{t1X%-6 zcKF}jpX_LtJRi1&rOl3DwxR5Q-3XEae57pM4+KdMB4z*zyH62Nw_T(?{t9S0DX5#W zFo#7l8jZG7!1>=Vvi|nqg{%?XZo3XJrJoQ}06^`>3IJKJ7GgQS72w*IRWS3cmUC(A^o~W66kD^h0QM8*DpFZ4Nd#`Zt88>)TTTYZIAQUmC0Lpak0{Vj*O3^KA7Jz}+0#Mt4<9Cwg(XRj-dCx`t#_ns6^6zPl z5dfeMT-D&)o+V_8HbLp1Q~)u9ucNOCux~}}u7u12waox^5Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00N*%L_t(|UhSH_P8&fG$M+N{Do(AV=b%u*u9(EJ>Shw zI_-LN_T29LJ+r%ZFqtAk`u)CaKkj{!Epq<#Otx|MZnrC28_-u8Sw0&v^`Vo;XA$V* zpnN`W0$5+$413A^{&O4l>|p_<(+FFprZhlZcx6R>|K;abvSsFjpx5ioN&pomDJp9T z!1tMyhODBlQwa#xUT=^JATBU@GK|WvpEu&$_mfCJx~OoCVhgTyR3DJpKAhf%uiR3k z0GzA=sDcmdyxk6a&q?wD0aY&~&W?bf;G%r~vf(5Hn5KIhbUzRzJ&0+$7aMz#Wr12? zHqXktfSNSI2_}?^gL3l?#DkXrZ$=45c(!j$YKn;ZHH;Y;TMN=68P)vLh zcNe=XfHIT!;3o~!vM_G~NZbX$VAPAL9!`D?asg+6Z16ci&8bWVi2LT*?gHXS$^g{m zF>MYh|DIME0RVa+@&-RH=)TuOlygif0H49v(bohROk2AtF0(*sGeDUH;0sj<`h4gj uDZ_lR0BR2J0%{HmpyrSXfYbjxBE%D25U)X?z9v)v0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00ON^L_t(|UhSH_j?^#^$0ym{+Y?7a0Syub zCmw(|fd<429NiT(9GtE~d^Hq^h9{t)fR&XtayY53$2>{{lr>u`QNGgD0 zkZP36`3x5Gb7dTjr;v{)s!i<(y$=Ua)oF?WHWfoG=OdjEKn(1G`a~79trmYF8|_@$ zg9f*u2x2-P;S@l~{2);UU|22Zu$Y~ziFQR56M2@4nX-*`b_<7w<*XurdXnq{vV08V z=^jjWuPSF_!M3?ZjBUDit+@9}u=52!WL5`Gk|iJ(DV6~4gsu(~^08lRhaOpr07^(L z0DB$B_Z|HC4&P4h!h`oe;Pc@fc=+KA2dD37##RZSZ1U-$P95ej2(caE`(<$ppl!BB z02~uv#jS&h2%yU}J@~1^cbfVpfXZC}PO4pm?IWj7whN`~9$JKcA?E-C2R~WX93WLn z;aYn`cL6S{#>Jh0*5v@4e^1*Q0U*>7O`Y!=3%A2V;Y<=)1(4GD6q=8i-xg~3C1w=p zYy{|%08(KKfjW_jB<6O{g$Q8a$Sz>uhyVr-n*b#I_Yr`9Npg77Jf{2m00000NkvXX Hu0mjfE3Ij- literal 0 HcmV?d00001 diff --git a/resources/assets/fm/textures/models/pipes/steel/Pipe.png b/resources/assets/fm/textures/models/pipes/steel/Pipe.png new file mode 100644 index 0000000000000000000000000000000000000000..c371da0962c74a1312fa7cb2ad950f1473f57cb2 GIT binary patch literal 810 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 Hu0mjf=^}5W literal 0 HcmV?d00001 diff --git a/resources/assets/fm/textures/models/pipes/wood/Pipe.png b/resources/assets/fm/textures/models/pipes/wood/Pipe.png new file mode 100644 index 0000000000000000000000000000000000000000..086a20d5adb7489cb361f725a046a9128ecde001 GIT binary patch literal 827 zcmV-B1H}A^P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)00007bV*G`2iyr42skM+$PSDE00OH?L_t(|UhSH{OB_KI$7kxwo8f}d7!mSz`-$vdZ0^V&`TG5{>~;3TFW0iS0ez*B<+l-2 zA1Zl#7J)hs%KK}Cy>mcJCXFc;ZvtS-K?BkYwyZ?I|7rKJ?3vjh=x(h{Y5*!s)~NFj z-Efr5^Vdh==s);9)gDJyQP-&k2!5QrAr*iwFnKael;!n(v9bI+){iPGEK+U3+9T=% zGTW<1Ai`#!_hQJK6Hhp&W?bfpi$m`*>I8pOw+v$sviiF8pO2i ztBt+LWr12?HuuWAfSN;I1jeb4Ge9yvGr*Jpo~;i&D zOSIY@F}LtQ1{)fT@iTz7cIV;v+C}T&GiLBptvOzn09W`}0;mhRG%)3ZUl`jSS+f9Q z@GXGoIu5^gaC#}ey;~DI?|+K3y{F>k$;~)&L3l+zDkXrphp!&$q=AP)Kr|4hZx*!x zil#CGpm^{}tUmh70w^t%D<;oMgV{sh`hnq&4oJPwoon+qyq36d=<4Ozj3&EZ`@&0zu595MlL`kzIFxCg|ai#YnXL@@vW002ovPDHLk FV1n=wZEyep literal 0 HcmV?d00001 diff --git a/src/dark/fluid/client/render/ItemRenderHelper.java b/src/dark/fluid/client/render/ItemRenderHelper.java index df9fbad30..fd6a245e2 100644 --- a/src/dark/fluid/client/render/ItemRenderHelper.java +++ b/src/dark/fluid/client/render/ItemRenderHelper.java @@ -14,6 +14,7 @@ import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelReleaseValve; import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; +import dark.fluid.common.pipes.PipeMaterial; @SideOnly(Side.CLIENT) public class ItemRenderHelper implements IItemRenderer @@ -52,7 +53,7 @@ public class ItemRenderHelper implements IItemRenderer GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(pipe.getTexture(item.itemID, item.getItemDamage())); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderPipe.getTexture(PipeMaterial.get(item.getItemDamage()), item.getItemDamage() % PipeMaterial.spacing)); if (!equ) { GL11.glTranslatef(0.5F, -0.5F, 0.5F); diff --git a/src/dark/fluid/client/render/RenderPipe.java b/src/dark/fluid/client/render/RenderPipe.java index 8e6b6175c..886640f0f 100644 --- a/src/dark/fluid/client/render/RenderPipe.java +++ b/src/dark/fluid/client/render/RenderPipe.java @@ -2,26 +2,23 @@ package dark.fluid.client.render; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.api.ColorCode; import dark.core.client.renders.RenderTileMachine; import dark.core.prefab.ModPrefab; -import dark.core.prefab.helpers.FluidHelper; import dark.fluid.client.model.ModelLargePipe; -import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; +import dark.fluid.common.pipes.EnumPipeType; +import dark.fluid.common.pipes.PipeMaterial; import dark.fluid.common.pipes.TileEntityPipe; @SideOnly(Side.CLIENT) public class RenderPipe extends RenderTileMachine { public ModelLargePipe SixPipe; - private boolean[] renderSide = new boolean[6]; public RenderPipe() { @@ -35,19 +32,21 @@ public class RenderPipe extends RenderTileMachine GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); - int meta = 0; - int blockID = FMRecipeLoader.blockPipe.blockID; + PipeMaterial mat = PipeMaterial.IRON; + if (te.getBlockMetadata() < PipeMaterial.values().length) + { + System.out.println("Pipe meta " + te.getBlockMetadata()); + mat = PipeMaterial.values()[te.getBlockMetadata()]; + } if (te instanceof TileEntityPipe) { - meta = te.getBlockMetadata(); - blockID = te.getBlockType().blockID; - - TileEntityPipe pipe = ((TileEntityPipe) te); - this.renderSide = pipe.renderConnection; - + this.render(mat, ((TileEntityPipe) te).getPipeID(), ((TileEntityPipe) te).renderConnection); + } + else + { + this.render(PipeMaterial.STONE, 0, new boolean[6]); } - this.render(blockID, meta, renderSide); GL11.glPopMatrix(); } @@ -55,22 +54,26 @@ public class RenderPipe extends RenderTileMachine @Override public ResourceLocation getTexture(int block, int meta) { - String name = ""; - if (meta < 16) - { - Fluid stack = FluidHelper.getStackForColor(ColorCode.get(meta)); - name = stack != null ? stack.getName() : ""; - } - else - { - name = ColorCode.get(meta).getName(); - } - return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "pipes/" + name + "Pipe.png"); + return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "pipes/Pipe.png"); } - public void render(int blockID, int meta, boolean[] side) + public static ResourceLocation getTexture(PipeMaterial mat, int pipeID) { - bindTexture(this.getTexture(blockID, meta)); + if (mat != null) + { + String s = ""; + if (EnumPipeType.get(pipeID) != null) + { + s = EnumPipeType.get(pipeID).getName(pipeID); + } + return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "pipes/" + mat.matName + "/" + s + "Pipe.png"); + } + return new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "pipes/Pipe.png"); + } + + public void render(PipeMaterial mat, int pipeID, boolean[] side) + { + bindTexture(RenderPipe.getTexture(mat, pipeID)); if (side[0]) { SixPipe.renderBottom(); diff --git a/src/dark/fluid/common/pipes/EnumPipeType.java b/src/dark/fluid/common/pipes/EnumPipeType.java index cfa856517..fbd4f87dc 100644 --- a/src/dark/fluid/common/pipes/EnumPipeType.java +++ b/src/dark/fluid/common/pipes/EnumPipeType.java @@ -15,11 +15,15 @@ public enum EnumPipeType implements IColoredId } @Override - public String getName() + public String getName(int pipeID) { - return "Colored Pipe"; + if (pipeID < 16 && pipeID > 0) + { + return ColorCode.get(pipeID - 1).name; + } + return ""; } - }, 0, 15, true); + }, 1, 16, true); private IPipeType type; public int metaStart = 1; @@ -69,7 +73,7 @@ public enum EnumPipeType implements IColoredId public static int getUpdatedID(int pipeID, ColorCode newColor) { - if(pipeID == 0) + if (pipeID == 0) { return 1 + newColor.ordinal(); } @@ -96,12 +100,12 @@ public enum EnumPipeType implements IColoredId return ColorCode.UNKOWN; } - public String getName() + public String getName(int pipeID) { if (type != null) { - return type.getName(); + return type.getName(pipeID); } - return "PipeType" + this.ordinal(); + return ""; } } diff --git a/src/dark/fluid/common/pipes/IPipeType.java b/src/dark/fluid/common/pipes/IPipeType.java index 8d259936a..a674f95b6 100644 --- a/src/dark/fluid/common/pipes/IPipeType.java +++ b/src/dark/fluid/common/pipes/IPipeType.java @@ -4,5 +4,5 @@ import dark.api.ColorCode.IColoredId; public interface IPipeType extends IColoredId { - public String getName(); + public String getName(int pipeID); } diff --git a/src/dark/fluid/common/pipes/ItemBlockPipe.java b/src/dark/fluid/common/pipes/ItemBlockPipe.java index acdbbb801..52349413e 100644 --- a/src/dark/fluid/common/pipes/ItemBlockPipe.java +++ b/src/dark/fluid/common/pipes/ItemBlockPipe.java @@ -33,7 +33,7 @@ public class ItemBlockPipe extends ItemBlock @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata / PipeMaterial.spacing)) + if (super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, (stack.getItemDamage() / PipeMaterial.spacing))) { TileEntity tile = world.getBlockTileEntity(x, y, z); if (tile instanceof TileEntityPipe) diff --git a/src/dark/fluid/common/pipes/PipeMaterial.java b/src/dark/fluid/common/pipes/PipeMaterial.java index 4c2f2ffe0..623b317a2 100644 --- a/src/dark/fluid/common/pipes/PipeMaterial.java +++ b/src/dark/fluid/common/pipes/PipeMaterial.java @@ -20,33 +20,31 @@ import dark.fluid.common.FMRecipeLoader; public enum PipeMaterial { /** Simple water only pipe. Should render open toped when it can */ - WOOD("wood", false, true, false, 50, 200), + WOOD("wood", false, true, false, -1, 200), /** Gas only pipe */ - GLASS("wood", true, false, false, 100, 300), + GLASS("glass", true, false, false, 100, 300), /** Another version of the wooden pipe */ - STONE("wood", false, true, false, 200, 1000), + STONE("stone", false, true, false, -1, 1000), /** Cheap fluid pipe */ - TIN("wood", false, true, false, 300, 1000), + TIN("tin", false, true, false, 300, 1000), /** Cheap fluid pipe */ - COPPER("wood", false, true, false, 400, 1000), + COPPER("copper", false, true, false, 400, 1000), /** First duel gas and fluid pipe */ - IRON("wood", true, true, false, 500, 1000), + IRON("iron", true, true, false, 500, 1000), /** Fluid movement pipe that doesn't work well with pressure */ - GOLD("wood", true, true, false, 200, 2000), + GOLD("gold", true, true, false, 200, 2000), /** Cheap molten metal pipe */ - OBBY("wood", false, true, true, 1000, 1000), + OBBY("obby", false, true, true, 1000, 1000), /** Very strong fluid and gas support pipe. Should also support molten metal as long as they * don't stay in the pipe too long. */ - STEEL("wood", true, true, false, 10000, 3000), + STEEL("steel", true, true, false, 10000, 3000), /** Weaker equal to steel pipes. Should also support steam very well */ - BRONZE("wood", true, true, false, 6000, 2000), + BRONZE("bronze", true, true, false, 6000, 2000), /** Hell fluids only. Meaning lava, and molten metals. Water should turn to steam, fuel and oil * should cause an explosion around the pipe */ - HELL("wood", true, true, true, 10000, 5000, "water", "fuel", "oil"); + HELL("hell", true, true, true, 10000, 5000, "water", "fuel", "oil"); public String matName = "material"; List unsupportedFluids = new ArrayList(); - public boolean supportsAllFluids = false; - public boolean supportsAllGas = false; public boolean canSupportGas = false; public boolean canSupportFluids = false; public boolean canSupportMoltenFluids = false; @@ -59,8 +57,8 @@ public enum PipeMaterial private PipeMaterial() { - supportsAllFluids = true; - supportsAllGas = true; + this.canSupportGas = true; + this.canSupportFluids = true; canSupportMoltenFluids = true; } @@ -100,7 +98,7 @@ public enum PipeMaterial { return PipeMaterial.values()[meta]; } - return null; + return PipeMaterial.WOOD; } public ItemStack getStack() @@ -142,7 +140,7 @@ public enum PipeMaterial public static int updateColor(Object cc, int pipeID) { - if(EnumPipeType.canColor(pipeID)) + if (EnumPipeType.canColor(pipeID)) { return EnumPipeType.getUpdatedID(pipeID, ColorCode.get(cc)); } diff --git a/src/dark/fluid/common/pipes/TileEntityPipe.java b/src/dark/fluid/common/pipes/TileEntityPipe.java index 1563ed07b..2dd96eb9d 100644 --- a/src/dark/fluid/common/pipes/TileEntityPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityPipe.java @@ -203,11 +203,39 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, { if (tileEntity instanceof INetworkPipe) { - if (((INetworkPipe) tileEntity).canTileConnect(Connection.NETWORK, side.getOpposite())) + if (tileEntity instanceof TileEntityPipe) + { + int meta = new Vector3(this).getBlockMetadata(this.worldObj); + int metaOther = new Vector3(tileEntity).getBlockMetadata(this.worldObj); + if (meta < PipeMaterial.values().length && metaOther < PipeMaterial.values().length) + { + PipeMaterial pipeMat = PipeMaterial.values()[meta]; + PipeMaterial pipeMatOther = PipeMaterial.values()[metaOther]; + //Same pipe types can connect + if (pipeMat == pipeMatOther) + { + this.getTileNetwork().merge(((INetworkPipe) tileEntity).getTileNetwork(), this); + return connectedBlocks.add(tileEntity); + }//Wood and stone pipes can connect to each other but not other pipe types since they are more like a trough than a pipe + else if ((pipeMat == PipeMaterial.WOOD || pipeMat == PipeMaterial.STONE) && (pipeMatOther == PipeMaterial.WOOD || pipeMatOther == PipeMaterial.STONE)) + { + this.getTileNetwork().merge(((INetworkPipe) tileEntity).getTileNetwork(), this); + return connectedBlocks.add(tileEntity); + }//Any other pipe can connect to each other as long as the color matches except for glass which only works with itself at the moment + else if (pipeMat != PipeMaterial.WOOD && pipeMat != PipeMaterial.STONE && pipeMatOther != PipeMaterial.WOOD && pipeMatOther != PipeMaterial.STONE && pipeMat != PipeMaterial.GLASS && pipeMatOther != PipeMaterial.GLASS) + { + this.getTileNetwork().merge(((INetworkPipe) tileEntity).getTileNetwork(), this); + return connectedBlocks.add(tileEntity); + } + } + return false; + } + else { this.getTileNetwork().merge(((INetworkPipe) tileEntity).getTileNetwork(), this); return connectedBlocks.add(tileEntity); } + } else { @@ -243,34 +271,6 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, else if (type == Connection.FLUIDS) { return true; - }//Network connections are only supported for if pipe materials match - else if (type == Connection.NETWORK && entity instanceof INetworkPipe) - { - if (entity instanceof TileEntityPipe) - { - int meta = new Vector3(this).getBlockMetadata(this.worldObj); - int metaOther = connection.getBlockMetadata(this.worldObj); - if (meta < PipeMaterial.values().length && metaOther < PipeMaterial.values().length) - { - PipeMaterial pipeMat = PipeMaterial.values()[meta]; - PipeMaterial pipeMatOther = PipeMaterial.values()[metaOther]; - //Same pipe types can connect - if (pipeMat == pipeMatOther) - { - return true; - }//Wood and stone pipes can connect to each other but not other pipe types since they are more like a trough than a pipe - else if ((pipeMat == PipeMaterial.WOOD || pipeMat == PipeMaterial.STONE) && (pipeMatOther == PipeMaterial.WOOD || pipeMatOther == PipeMaterial.STONE)) - { - return true; - }//Any other pipe can connect to each other as long as the color matches except for glass which only works with itself at the moment - else if (pipeMat != PipeMaterial.WOOD && pipeMat != PipeMaterial.STONE && pipeMatOther != PipeMaterial.WOOD && pipeMatOther != PipeMaterial.STONE && pipeMat != PipeMaterial.GLASS && pipeMatOther != PipeMaterial.GLASS) - { - return true; - } - } - return false; - } - return true; } return false; } @@ -317,6 +317,11 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, @Override public double getMaxPressure(ForgeDirection side) { + int meta = this.worldObj.getBlockMetadata(xCoord, yCoord, zCoord); + if (meta < PipeMaterial.values().length) + { + return PipeMaterial.values()[meta].maxPressure; + } return 350; } @@ -357,6 +362,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, * @return flow rate in mili-Buckets */ public int calculateFlowRate(FluidStack fluid, float pressure, float temp) { + //TODO recalculate this based on pipe material for friction if (fluid != null & fluid.getFluid() != null) { float f = .012772f * pressure;