From 2833d58e848ebaf202b0aace8fbf623b3d22fe1e Mon Sep 17 00:00:00 2001 From: George Paton Date: Mon, 27 Oct 2025 14:09:04 +1100 Subject: [PATCH] adjust cable hitboxes and make them look more like red copper --- .../com/hbm/blocks/network/PowerCableBox.java | 45 ++++-------------- .../textures/blocks/boxduct_cable_end_0.png | Bin 499 -> 497 bytes .../textures/blocks/boxduct_cable_end_1.png | Bin 435 -> 437 bytes .../textures/blocks/boxduct_cable_end_2.png | Bin 436 -> 446 bytes .../textures/blocks/boxduct_cable_end_3.png | Bin 432 -> 415 bytes .../textures/blocks/boxduct_cable_end_4.png | Bin 413 -> 405 bytes 6 files changed, 10 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/hbm/blocks/network/PowerCableBox.java b/src/main/java/com/hbm/blocks/network/PowerCableBox.java index 7d63edde2..b2c67fd42 100644 --- a/src/main/java/com/hbm/blocks/network/PowerCableBox.java +++ b/src/main/java/com/hbm/blocks/network/PowerCableBox.java @@ -153,8 +153,6 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { double lower = 0.125D; double upper = 0.875D; - double jLower = 0.0625D; - double jUpper = 0.9375D; int meta = world.getBlockMetadata(x, y, z); for(int i = 0; i < 5; i++) { @@ -162,8 +160,6 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { if(meta > i) { lower += 0.0625D; upper -= 0.0625D; - jLower += 0.0625D; - jUpper -= 0.0625D; } } @@ -174,10 +170,9 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { boolean nZ = canConnectTo(world, x, y, z, Library.NEG_Z, te); boolean pZ = canConnectTo(world, x, y, z, Library.POS_Z, te); int mask = 0 + (pX ? 32 : 0) + (nX ? 16 : 0) + (pY ? 8 : 0) + (nY ? 4 : 0) + (pZ ? 2 : 0) + (nZ ? 1 : 0); - int count = 0 + (pX ? 1 : 0) + (nX ? 1 : 0) + (pY ? 1 : 0) + (nY ? 1 : 0) + (pZ ? 1 : 0) + (nZ ? 1 : 0); if(mask == 0) { - bbs.add(AxisAlignedBB.getBoundingBox(x + jLower, y + jLower, z + jLower, x + jUpper, y + jUpper, z + jUpper)); + bbs.add(AxisAlignedBB.getBoundingBox(x + lower, y + lower, z + lower, x + upper, y + upper, z + upper)); } else if(mask == 0b100000 || mask == 0b010000 || mask == 0b110000) { bbs.add(AxisAlignedBB.getBoundingBox(x + 0.0D, y + lower, z + lower, x + 1.0D, y + upper, z + upper)); } else if(mask == 0b001000 || mask == 0b000100 || mask == 0b001100) { @@ -185,12 +180,7 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { } else if(mask == 0b000010 || mask == 0b000001 || mask == 0b000011) { bbs.add(AxisAlignedBB.getBoundingBox(x + lower, y + lower, z + 0.0D, x + upper, y + upper, z + 1.0D)); } else { - - if(count != 2) { - bbs.add(AxisAlignedBB.getBoundingBox(x + jLower, y + jLower, z + jLower, x + jUpper, y + jUpper, z + jUpper)); - } else { - bbs.add(AxisAlignedBB.getBoundingBox(x + lower, y + lower, z + lower, x + upper, y + upper, z + upper)); - } + bbs.add(AxisAlignedBB.getBoundingBox(x + lower, y + lower, z + lower, x + upper, y + upper, z + upper)); if(pX) bbs.add(AxisAlignedBB.getBoundingBox(x + upper, y + lower, z + lower, x + 1.0D, y + upper, z + upper)); if(nX) bbs.add(AxisAlignedBB.getBoundingBox(x + 0.0D, y + lower, z + lower, x + lower, y + upper, z + upper)); @@ -227,8 +217,6 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { float lower = 0.125F; float upper = 0.875F; - float jLower = 0.0625F; - float jUpper = 0.9375F; int meta = world.getBlockMetadata(x, y, z); for(int i = 0; i < 5; i++) { @@ -236,8 +224,6 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { if(meta > i) { lower += 0.0625F; upper -= 0.0625F; - jLower += 0.0625F; - jUpper -= 0.0625F; } } @@ -248,10 +234,9 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { boolean nZ = canConnectTo(world, x, y, z, Library.NEG_Z, te); boolean pZ = canConnectTo(world, x, y, z, Library.POS_Z, te); int mask = 0 + (pX ? 32 : 0) + (nX ? 16 : 0) + (pY ? 8 : 0) + (nY ? 4 : 0) + (pZ ? 2 : 0) + (nZ ? 1 : 0); - int count = 0 + (pX ? 1 : 0) + (nX ? 1 : 0) + (pY ? 1 : 0) + (nY ? 1 : 0) + (pZ ? 1 : 0) + (nZ ? 1 : 0); if(mask == 0) { - this.setBlockBounds(jLower, jLower, jLower, jUpper, jUpper, jUpper); + this.setBlockBounds(lower, lower, lower, upper, upper, upper); } else if(mask == 0b100000 || mask == 0b010000 || mask == 0b110000) { this.setBlockBounds(0F, lower, lower, 1F, upper, upper); } else if(mask == 0b001000 || mask == 0b000100 || mask == 0b001100) { @@ -260,23 +245,13 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { this.setBlockBounds(lower, lower, 0F, upper, upper, 1F); } else { - if(count != 2) { - this.setBlockBounds( - nX ? 0F : jLower, - nY ? 0F : jLower, - nZ ? 0F : jLower, - pX ? 1F : jUpper, - pY ? 1F : jUpper, - pZ ? 1F : jUpper); - } else { - this.setBlockBounds( - nX ? 0F : lower, - nY ? 0F : lower, - nZ ? 0F : lower, - pX ? 1F : upper, - pY ? 1F : upper, - pZ ? 1F : upper); - } + this.setBlockBounds( + nX ? 0F : lower, + nY ? 0F : lower, + nZ ? 0F : lower, + pX ? 1F : upper, + pY ? 1F : upper, + pZ ? 1F : upper); } } 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 f18156dfb4a46c238f13f7ae7f4e6f628902a178..558b9fd729043dd2712fb036f08ca279fcaec83b 100644 GIT binary patch delta 367 zcmV-#0g(Rl1Mvfpi+=+GE3EqsP5=M_M@d9MR5;6(lUr`WKnz8XJrfcLbOZej8|YfQ zEY<)Y?Fy1o@*2Azg|syEWy!KMnsevsjx3z3swxj5@U>G)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 N002ovPDHLkV1h!!sD}Um delta 369 zcmV-%0gnFh1M>rri+=ztG$^vS&Hw-bNl8ROR5;6(lh10yFbs!(vJ%@Vw9xa|p^!eo zUUbj1hiT8HmyyB}Cy}&6n*K}It_C4v_&&=rA{NYTdMQp^ zS(Zjb5D_@%;G6>yP4ewoRaG!EWXudAf|=p-T@V9d;RJIw6n~k6FFdl~5rRh^a>VHI z@%0U6z80t|Vj#SELE#x$3V}f51!3X@AfdWsi5zBEZk#QetyuU4yrm8IOi~D zdki-%Qfdb<%dQ1Pgd%fK;Xbu6bLR>~UJv-x${~*fePwRnrlz P00000NkvXXu0mjf$112d 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 402994b21b8ac84a16deca66dfb0be5ea50106bc..b0ecf38dc35b1ae8a96db12feb03af2ea48ab332 100644 GIT binary patch delta 307 zcmV-30nGlh1GNK?i+=+G8;T-5;s5{v3rR#lR5;6(lTmKMFc3s%*GWw&eDw;>33~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 FV1jIWixvO? delta 305 zcmV-10nYxl1G58=i+=zv537$nXaE2K2}wjjR5;6(lU;6uFc5@iclk@iF`yUdwJY^T zAoU15BtY2RJWyLTAevYjS+X>rXDlz_cQsApB7&_{^-z7^698}k5YbzTzNTrMh@h%q zW-v2|Xt!_AhGBraBNGu25!^ij{)4D0L?i{68JHR0A2Tk6Ab+b$l$Qc|RiZ2l0i+=+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!i+=zvA$M6ZrvLx}3Q0skR5;6(lR<98APhynZDx|rIf%0Cs@Lwe zw@EfVK^D`=48~owAP7k9AX!L=|NLz*;dgoOO+;`ERqe*Qt^@#_07UduWS#fkhzP0* zW(G5Zh?@O)wrv~C3{FHqL@=`q_zR+{5Rn=XV+1opL@MD?9DhQ9nYDlrLKb|y8itoM zPUC=KIO8;)A(so@-albxh%vT+GE+~i*DK5{hjXq5l$Lwq$L*f8S0$)w)3Ba+-|tx* zV}z>KfD+OZKW;l>j2Y4Z%2Imb{cDFAH4bQ=XCoqv;|OMkb1r8|myg!dlXpuifNjjn#N^W>S-)L$$uiPZ{(O~CDKL&{{R3007*qoM6N<$ Ef+Ep}!2kdN diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_3.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_3.png index a043c24a57a5ff59370e16939dc9168dcaf2abe8..e3996afa5732ef9dca1567a84969374f0573a161 100644 GIT binary patch delta 285 zcmV+&0pk9!1D^wsi+=+FI_+kDe*gdg^+`lQR5;6(lU-`VKn#ROl1(6xTdbiM==J;9 zW7uy!Kmvi#m8LKCvOn%m76!xO`81L(!S_ii(ag}x-4C^Gn*f0B01-i+=zvHuQ?LU;qFC21!IgR5;6(lS^*HFbqV8q@5H#hrIE=%U-!> z=t=BNPT)n*q$1fxD^(u@X#@-m7@kLREE0ZC2*E`JtyJ|;+qMw^Z~_p~Q_8*&f)f!` z70e7~1`&17_T9ekaCZzM0wRLDXTT$fszO9+fSG}rAtIHrHGjt#;qE;k#@JPF&1MF7 zhne+&_T!JY3Fq?(TkVWLPcbs)vD<=C99tWi~UY zY7J<|D9yLq9cGs0?ioPKvN#b{x33H=RVwIT?bdwMK{rDB&+W`5pe#^@ zn5bq$gGR5;6(lfiMsAPhynkbT?~kTWhJDIkTX zfusiemIAz2q@Tk^9s~AnmYF|h7{8A`Ai>|rIa5{9%FGV6EQ&N*kARrij4I zkWxZQ2_n*c+qHFFK@x+iLPS7vGk9cTW>D4Iz}=Bjf~r`V?enLC zLnM2Hh;fv851v*qj^ji4ZUyZ}HKRQGAYFUw zqIalJ2qJ=% z5>iSaqTw6wwrzu%Au}_G2xfK&yb=)+F!NbJRgqExGoQc+w|~}PW}`rBZSWppRfU;B zRY!sN^E22j=e(!w?dm~?zdt|l^L0JJzIQH*$kT%H