From 7161a1ef73bf23e86294c7b8bf4323c9e92d287e Mon Sep 17 00:00:00 2001 From: George Paton Date: Mon, 27 Oct 2025 16:35:36 +1100 Subject: [PATCH] improve junction connections and add better textures --- .../com/hbm/blocks/network/PowerCableBox.java | 33 +++++++++--------- .../blocks/boxduct_cable_curve_bl.png | Bin 304 -> 229 bytes .../blocks/boxduct_cable_curve_br.png | Bin 302 -> 235 bytes .../blocks/boxduct_cable_curve_tl.png | Bin 274 -> 195 bytes .../blocks/boxduct_cable_curve_tr.png | Bin 313 -> 241 bytes .../textures/blocks/boxduct_cable_end_0.png | Bin 497 -> 514 bytes .../textures/blocks/boxduct_cable_end_1.png | Bin 437 -> 514 bytes .../textures/blocks/boxduct_cable_end_2.png | Bin 446 -> 500 bytes .../textures/blocks/boxduct_cable_end_3.png | Bin 415 -> 476 bytes .../textures/blocks/boxduct_cable_end_4.png | Bin 405 -> 361 bytes .../blocks/boxduct_cable_junction.png | Bin 331 -> 338 bytes .../blocks/boxduct_cable_straight.png | Bin 239 -> 141 bytes 12 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/hbm/blocks/network/PowerCableBox.java b/src/main/java/com/hbm/blocks/network/PowerCableBox.java index b2c67fd42..adb592805 100644 --- a/src/main/java/com/hbm/blocks/network/PowerCableBox.java +++ b/src/main/java/com/hbm/blocks/network/PowerCableBox.java @@ -83,28 +83,29 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { return (side == 2 || side == 3) ? iconEnd[meta] : iconStraight; } else if((mask & 0b110011) == 0 && mask > 0) { return (side == 0 || side == 1) ? iconEnd[meta] : iconStraight; - } else if(count == 2) { + } else { if(side == 0 && nY || side == 1 && pY || side == 2 && nZ || side == 3 && pZ || side == 4 && nX || side == 5 && pX) return iconEnd[meta]; - if(side == 1 && nY || side == 0 && pY || side == 3 && nZ || side == 2 && pZ || side == 5 && nX || side == 4 && pX) - return iconStraight; - if(nY && pZ) return side == 4 ? iconCurveBR : iconCurveBL; - if(nY && nZ) return side == 5 ? iconCurveBR : iconCurveBL; - if(nY && pX) return side == 3 ? iconCurveBR : iconCurveBL; - if(nY && nX) return side == 2 ? iconCurveBR : iconCurveBL; - if(pY && pZ) return side == 4 ? iconCurveTR : iconCurveTL; - if(pY && nZ) return side == 5 ? iconCurveTR : iconCurveTL; - if(pY && pX) return side == 3 ? iconCurveTR : iconCurveTL; - if(pY && nX) return side == 2 ? iconCurveTR : iconCurveTL; + if(count == 2) { + if(side == 1 && nY || side == 0 && pY || side == 3 && nZ || side == 2 && pZ || side == 5 && nX || side == 4 && pX) + return iconStraight; - if(pX && nZ) return side == 0 ? iconCurveTR : iconCurveTR; - if(pX && pZ) return side == 0 ? iconCurveBR : iconCurveBR; - if(nX && nZ) return side == 0 ? iconCurveTL : iconCurveTL; - if(nX && pZ) return side == 0 ? iconCurveBL : iconCurveBL; + if(nY && pZ) return side == 4 ? iconCurveBR : iconCurveBL; + if(nY && nZ) return side == 5 ? iconCurveBR : iconCurveBL; + if(nY && pX) return side == 3 ? iconCurveBR : iconCurveBL; + if(nY && nX) return side == 2 ? iconCurveBR : iconCurveBL; + if(pY && pZ) return side == 4 ? iconCurveTR : iconCurveTL; + if(pY && nZ) return side == 5 ? iconCurveTR : iconCurveTL; + if(pY && pX) return side == 3 ? iconCurveTR : iconCurveTL; + if(pY && nX) return side == 2 ? iconCurveTR : iconCurveTL; - return iconJunction; + if(pX && nZ) return side == 0 ? iconCurveTR : iconCurveTR; + if(pX && pZ) return side == 0 ? iconCurveBR : iconCurveBR; + if(nX && nZ) return side == 0 ? iconCurveTL : iconCurveTL; + if(nX && pZ) return side == 0 ? iconCurveBL : iconCurveBL; + } } return iconJunction; diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_bl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_bl.png index 2dce54766f5323b9173ef5a2de814bff4269946d..182512e485cf97d24e81b190c282a331a4e11d04 100644 GIT binary patch delta 201 zcmV;)05<=y0_6daB!8?)L_t(I5yg{14#OY}1VJ)i;=un;JPDB6F3GxXWkPzYB?JP` z*g+wNGfF8B5eXbArMVtsgx-6=Y)7p%0u>5y=!FNj)-*NdoVBvx>wXMv32qs4u8(w%Y@7@zrDsM?TnDncO)W%00000NkvXXu0mjf D3yNBk delta 277 zcmaFLxPfVcNG(&67Iy3=9k`>5jgR3=A9lx&I`x0{IHb9znhg3{`3j3=J&| z48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!CBxDS#JUET5HPWP}DfH^;M$gQI94Szs0Kx)Veu5l$MsTe80!YaITeQ)i3LI zR%02ln1>S*SpReWaeaRA%=EI!J49^`Mjzy>6Pa_s`=A7~gB!99=L_t(I5yey63PT|b(^0{1^8cUwB2i&mWGS6f=-Ucnk4@4X zFEM!i~`J6M1F#={gYON7ep#X}fIFWnr3XSLta?V*7Jqg{s9jl3D*+aIN zF98&+patG?6|j4N4fKW(Yz08}I#CC$wV$RQ5kY4h)h%{s#7L1RJZBb8^GSrf<=_O^ zg?5+VV5orSe{CZQJeceqZ{NgoUIO-R--vddWboFDLh)~}@dXgn#O6EsAaei!002ov JPDHLkV1i6VT^j%Z delta 275 zcmaFOxQ=OpNG(&67Iy3=9k`>5jgR3=A9lx&I`x0{IHb9znhg3{`3j3=J&| z48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!CBxDSN9buG`^#I7&A z*ug?s>DU>G)vGQ~3*umy#GJM*l)tlMrex5oFb%%cw0(S*?Ty!N$*$PS#4y8>Mc|@L zhZ29n8Lmhs?Ip~sesM80tg5qr#8u(EtwC}VZ_f$l4!=e9c52B!7xYL_t(I5#5t(3VDWpL{9NdGa~l~0|aA6G(&67Iy3=9k`>5jgR3=A9lx&I`x0{IHb9znhg3{`3j3=J&| z48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!CBxDS5p+0mflC7GJ1S!~~M;ZBB& q4x`a`RfqR~B@_0&7iEb5e~h=)q*(JIM_(P#QU*^~KbLh*2~7ZBUr(+8 diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_tr.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_tr.png index 8037083496a412a7a70efa8fcbb2a4d661cda251..a773d39866cc7f53f8c63d38ba0773efbe8de740 100644 GIT binary patch delta 213 zcmV;`04o2v0`UQmB!9R`L_t(I5yg{H3d0}}L={%>M1JJ{2kBCV$4tFkK;Ju5Mvzf6azqaodi(s zzk8ltbc(hAC%`HOcmNQ|DjaK9!VeZ;=SG(&67Iy3=9k`>5jgR3=A9lx&I`x0{IHb9znhg3{`3j3=J&| z48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!CBxDSi2YU46!(U^zv@r0}4F#EEhhfi`=MJ5j$w%>)?50`zcSopgY2j zZ3XHr50skT&xkA!@?v3#VN|l3b*MelmxV;T>OjdzZ)W8=b3|7`!y| z7o6JM!7*=t4U5g`*au5$SiYRnKX9h4VJ7dxvQFiMusEjGpG0nGmNTZ^yVW{tTc_xa iyGQgL_KWX7#$7FUGH2cno(iDj7(8A5T-G@yGywo?vS#)G diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_0.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_0.png index 558b9fd729043dd2712fb036f08ca279fcaec83b..cab58ce1fff4f0db919098150d9eeb4894f58379 100644 GIT binary patch delta 384 zcmV-`0e}AS1A+vQi+=?i8MNRZqW}N_SV=@dR5;6(ld(?2Fc5~n!r4_;Nb>-QC9rhr z%7)Yj;1PJxcI?!pVX5)}Dd|{*?WPQl-Grt{Sh6hpe4qcj^Nnc7Y&JWI2;Hfa!di=S zt~ZS_tk>%ifCRvhvq&^w9THwX91du$BfvQqK}nLtbFFo_cYkW{oDJ_^C3m-Qf8*(y z@@r-NS~svi!g4x~>ZB_>IA;nb0%;q;L}2HD7G#VW1_bAiZ~tmnLES(;_K*->1Sq9& z&c)X%3oq&u9-aWm%YubXqs=*oQl2g$+af}yyzETjonPNzyYcxbt7z*gxCwO*#NOC$ z;PLt5IQUp=k$E6JNfIi14k0fKf4eN8EU12k0Iia+36gfsCv0I;va)KEm{K=wCHMnS zH$Kbxc({zA8iN3>HTz=-^0JKGkJJMgVG)H~Vln2!LJ$MC4yRaaC2h zh>%i3RZ&$$WH!H^)pd=#6GI4y2=30~x~0eicNiOWN`=KTBYze-d7iOYD7r3r*u4-! zxE3%oiac;16J-=)QIIclvNNo!6>K)x(=+Zq7Z}HpJM0YSH({EFz8^4?xqzy&QUCU3 zng)A)rRxUVGh&R_0wO}G{0fh4hkN{RkW!i)ESA}i@X&VjrvWn~rF1PIB2(Jm!QH9j zXyER1fe^y4@Mzd}G$ywlWZC;a{{$aLrzYHXAR_3x#Gan%`(X;KKMfoW8WU;)ZI>`J z+FHv N002ovPDHLkV1l9}s22bL diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_1.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_1.png index b0ecf38dc35b1ae8a96db12feb03af2ea48ab332..feaf2122e55f12e1b3c2bd9b9e08b0f9e3183d43 100644 GIT binary patch delta 384 zcmV-`0e}9r1A+vQi+=?iA)Ml;Jpcd!SV=@dR5;6(ld*2XFc5}6s&fK+k_SLtpi>vt zZe2U|b^0=W5>_TuiLjtNKme&yB&6CW=-}8uN?O&D7u)yUfA{+av}-n-okWDoZH&P= zhpJv}Yc0#=asVI!a4T3OUiU5unGc5pNs>f>sz%UgG>Yd*l7EDEr}oYHVmKWBP|yub z)0C!ZqB`kHfBXEPFpvvmZ3R1ptwQbK{qY5BZ9kweu>SIo3*!N`gZ&XEDOhV`c@bcY zK~*uvkc$s^GCLSg0hm-JbC;3J8DNa3OSjfc+RWoAJio$b1wc{NWJ0tuD7Xtg-?VMB zg8PT7BUO!m!+AM}s476TYS%VvQk6cUDxoT=+Y*9;0E>WN)mDAO<}RbC>b8j)`=fUv zWbXyk&UgFL#$3)e_9_UUB={V<9d>snBEVW30Zr5V85o8MyrmMSO62sPVOlH}*V7ne eb=PkS0KNet{}mL0a(Wj4000033~MY z_AKP5CxDg`k=^MBwIvhef~AqA$n!i|?+X4_N{Jx^T+7UEY8*!a0L=gqc}T^VQlf~! z%%G}JRfx!9zy7x0??Dn>2mvAjk_GS|#LN&vr~&Q{RmJ=37k^$lLAQ#C&k_A9BE}xN zUIW`L-abA-atWB{8LHYe<8S~;xcd^2W46qGJc8uK*mX4^Lt5r(I>X)TUof*OLCbtT zO&}HS4l}C(B|*bH{Y-F=Ah`sTS~Se_X#)9lJ3-&~mkw)~zh{;jWI*Y}&1QoTLOGD1 z>w3@1%~usMQ!MX+0JtQ`Lop1)L({n1?doaFH{PqfegRmHUPMRaqFMj|002ovPDHLk FV1hF0isk?S diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_2.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_2.png index a4861bff091139b594f79f1e3c414ff29e9e12ef..4ca6dfb6203fff1f8ade2d45f2334e1a49d9e4e1 100644 GIT binary patch delta 370 zcmV-&0ge8?1M~xsi+=?iCv|}W2mk;9N=ZaPR5;6(lQC|>KoCVAXm&9*hy#!`Aw4Z! zZje*tUfhG03PlQ4M-#x@WsE3H=Ro%#FLe`Y{4mdoWuL}~^~WfVjY|WRY}ycZlD7JRXTLCIK@`LgVo`eUCAE+<&Es`8~+8?24eDI2w&8 z%QDePAN_PXk!4wjz=>2909Cy&AR@edzcU%aEY$BTDma{B{jfq+lXwycAz)@{oeW_W zzF@up;3?m;siuj-V*#Z9RuQRho-g3#6+S-znB_&sN+%e)&o1Q3K%M;foVFg@Ud7A+ zI#v}`jSWD)hiiOK(LBK?P?Pw^tuiwXXV_FzW_i*4#3_e!m*TE~sCCvZrgPw)E4mKh%r)@WlFqB&}ybsP^qg#F8^t!?RMMkM#t)pzX$++03IqSZvW3Y Qn*aa+07*qoM6N<$f@GnnGXMYp delta 316 zcmV-C0mJ_E1HJ>0i+=+G4(I>b2><{A6iGxuR5;6(lTB*GFbsvCBo9dk<^o+i%n5q@ z_9)4&2S{M1VJxeQ*2Z=W?HC@0koW1w65;oF?@dI|N>#gBmW2R-6M%@GQucZ8jfkMC zU}i8gi0E*)-_~`7nZbz&hzMqu0e?YM6(UjtVvJyBh)88@&3_>TnAs5!Ldb^q*E@!n z0jJSn7*62x8Ms{V_VEcbLyYkVC?oxthsum?gPCPH=W0NiavK@jhIqT>=v4`-dT3bB zyzh@}jxj=2Yd{6*m>*v|Vw4O?08W!t4N1qm-}hX9%0N{?*Xz}Y2;(?{ncgmb5C8T#Q8#PwmCGgP1R9Blp4*~#YhP)NiG(EMA^E}tvSPsd5l+HJHYGn!wIsgCxGD$>1R5;6(lQC`rK@3G7k;egO)kGrt?-@qhS_gQ2jhDw?JVcQUlz z%{COODoxXnbG{D{5e|pLO(%6-lXH&p0+3R|%zB4EzrSGi+IDKcWjS4NKA!`SQfdLi zT0NM(!utp8HUQYsLfm!mgBYy!fNkl$$1pY`p& zeK*!T$TKkCfVD#bFSv&R8QR_|fL)T_cH6eGi*jXI+As{O0D0o9f_-P+U!HF4`Qamq zdsq%&&pKxb$#(4U`EGW5AO8#9z8L0!8ljJe0ACshk8gK2y?#Xp+B@}Pq7%IU2xj(s z_OQCs^iTj8KuCM`Fo4FDfV%6P_n0fheP0+j=hBYyw^b5ch_0olnce*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFT zCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf6951U69E94 zoEQKA00(qQO+^Rk3L66fAEsieH~;_u>q$gGR5;6(lfiMsAb$)+zmR?06p%A6At@k* zr-7sf`<4Q{SEQfAMjiw9ZkCxpW*EPZJ|My0$T?G0(aOvYwJeJOKnep9c}g3XbEb&E z%#cz-N(my;ecQElT|p9qszO9Sax-{jVrEd)+Q8kBQi7^hU<;R0K(aR|rF6Tuu)BjK z+`Ttwe?Egl!*np*V#jsu!GOQtU-0$uTEQ_7ZZNac1HlT8l9AP9w@2`;!0_g{DAd4Qy| z85(O~T8G4qJU)JuhOddpNko`W?;U0acfTD~#TcUj00kfmCc50EwaC0e0^sgx6#$^B zpa|HpS-%ZfwOfEpN73&;!2m#Srp?Uhy}N_V>@j;xJ+0uElSrAbXDlnI0Bc*Bt^`yw zS+yzPX`r*--9f7QI(UVsDk!!}M9!V>d>qGp8|O;qOw~GveE^CLgf+B!glfex{AqYeVr4;SIAT32?FRO9! zv(Zm77s)&Uh477(lExTe1pp$lsn$vWzym-;kMeTUmr~Mk$jnC-wAP@iP*re@5k!O# z0#1XO(R+Uf7*!F`Jz$t$0ao)hz?xUU`Q*HTipZpSH;c%Yn?bMO0c_b8@)z*bvxT?- z&uk$Zp!W`DJ{sKmmFHIEoUgXAl=8ccgJ|XDMtlH7rMk$XnxxwR0000!6(2`P*K3ZJBfGC*c5y-*= zGdo2DHL7~wnTd!1_j}xZQ7UCnLhcgt?r?O3?mq^=WH1@9C%bN}>KFd%T-*yYaVr>D SDnH5q0000aVy4! zn7Xp;7A$=6&cK-IzyX$%tFMZle!y@0!ja#OZD!@xU5^-b>r510p5OQ%Xd;8BtDnm{ Hr-UW|>P19B