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 2dce54766..182512e48 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_bl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_bl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_br.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_br.png index 9c7c56dae..030ddc650 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_br.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_br.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_tl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_tl.png index 11e8b1f17..0ad6ad2b2 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_tl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_tl.png differ 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 803708349..a773d3986 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_tr.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_curve_tr.png differ 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 558b9fd72..cab58ce1f 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_0.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_0.png differ 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 b0ecf38dc..feaf2122e 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_1.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_1.png differ 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 a4861bff0..4ca6dfb62 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_2.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_2.png differ 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 e3996afa5..8b6f8a927 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_3.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_3.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_4.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_4.png index 3cabe42bd..fa4509cd9 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_4.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_end_4.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_junction.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_junction.png index 0a5544202..48c1e212c 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_junction.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_junction.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_straight.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_straight.png index 0fd3f18a6..f539d23ad 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_straight.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_cable_straight.png differ