diff --git a/changelog b/changelog index cdd12bb6a..c4aad0278 100644 --- a/changelog +++ b/changelog @@ -1,10 +1,8 @@ ## Changed -* Changed PRISM's resistance function to work more like armor resistance instead of a straight divider -* Capped PRISM's resistance value per block to 100 (bit over concrete) -* Removed the unused rare metal ores, freeing up 5 block IDs -* Changed the .75 bolt recipes +* Updated boxducts + * All boxducts are now way cleaner, only having bolts on intersections, with straight parts only having very light seams + * Intersections now have unique textures for each size + * Copper boxducts now have a much nicer color gradient + * Exhaust pipes now have a more rusted appearance -## Fixed -* Fixed PRISM crashing instantly -* Fixed PRISM's resistance check being on backwards -* Fixed PRISM's resistance check omitting the wrong layers \ No newline at end of file +## Fixed crash caused by PRISM updating unloaded worlds \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctBox.java b/src/main/java/com/hbm/blocks/network/FluidDuctBox.java index ab63cb957..fb759fb93 100644 --- a/src/main/java/com/hbm/blocks/network/FluidDuctBox.java +++ b/src/main/java/com/hbm/blocks/network/FluidDuctBox.java @@ -35,7 +35,7 @@ public class FluidDuctBox extends FluidDuctBase implements IBlockMulti, ILookOve @SideOnly(Side.CLIENT) public IIcon[] iconCurveTR; @SideOnly(Side.CLIENT) public IIcon[] iconCurveBL; @SideOnly(Side.CLIENT) public IIcon[] iconCurveBR; - @SideOnly(Side.CLIENT) public IIcon[] iconJunction; + @SideOnly(Side.CLIENT) public IIcon[][] iconJunction; private static final String[] materials = new String[] { "silver", "copper", "white" }; @@ -55,7 +55,7 @@ public class FluidDuctBox extends FluidDuctBase implements IBlockMulti, ILookOve iconCurveTR = new IIcon[count]; iconCurveBL = new IIcon[count]; iconCurveBR = new IIcon[count]; - iconJunction = new IIcon[count]; + iconJunction = new IIcon[count][5]; for(int i = 0; i < count; i++) { iconStraight[i] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_" + materials[i] + "_straight"); @@ -64,7 +64,7 @@ public class FluidDuctBox extends FluidDuctBase implements IBlockMulti, ILookOve iconCurveTR[i] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_" + materials[i] + "_curve_tr"); iconCurveBL[i] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_" + materials[i] + "_curve_bl"); iconCurveBR[i] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_" + materials[i] + "_curve_br"); - iconJunction[i] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_" + materials[i] + "_junction"); + for(int j = 0; j < 5; j++) iconJunction[i][j] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_" + materials[i] + "_junction_" + j); } } @@ -83,7 +83,8 @@ public class FluidDuctBox extends FluidDuctBase implements IBlockMulti, ILookOve 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); - int m = rectify(world.getBlockMetadata(x, y, z)); + int meta = world.getBlockMetadata(x, y, z); + int m = rectify(meta); if((mask & 0b001111) == 0 && mask > 0) { return (side == 4 || side == 5) ? iconEnd[m] : iconStraight[m]; @@ -112,10 +113,10 @@ public class FluidDuctBox extends FluidDuctBase implements IBlockMulti, ILookOve if(nX && nZ) return side == 0 ? iconCurveTL[m] : iconCurveTL[m]; if(nX && pZ) return side == 0 ? iconCurveBL[m] : iconCurveBL[m]; - return iconJunction[m]; + return iconJunction[m][meta / 3]; } - return iconJunction[m]; + return iconJunction[m][meta / 3]; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctBoxExhaust.java b/src/main/java/com/hbm/blocks/network/FluidDuctBoxExhaust.java index 42a24fe85..41a081993 100644 --- a/src/main/java/com/hbm/blocks/network/FluidDuctBoxExhaust.java +++ b/src/main/java/com/hbm/blocks/network/FluidDuctBoxExhaust.java @@ -46,7 +46,7 @@ public class FluidDuctBoxExhaust extends FluidDuctBox { iconCurveTR = new IIcon[1]; iconCurveBL = new IIcon[1]; iconCurveBR = new IIcon[1]; - iconJunction = new IIcon[1]; + iconJunction = new IIcon[1][5]; iconStraight[0] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_exhaust_straight"); iconEnd[0] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_exhaust_end"); @@ -54,7 +54,7 @@ public class FluidDuctBoxExhaust extends FluidDuctBox { iconCurveTR[0] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_exhaust_curve_tr"); iconCurveBL[0] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_exhaust_curve_bl"); iconCurveBR[0] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_exhaust_curve_br"); - iconJunction[0] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_exhaust_junction"); + for(int i = 0; i < 5; i++) iconJunction[0][i] = iconRegister.registerIcon(RefStrings.MODID + ":boxduct_exhaust_junction_" + i); } public boolean canConnectTo(IBlockAccess world, int x, int y, int z, ForgeDirection dir, TileEntity tile) { diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java index 87a1f6cd7..bed495862 100644 --- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java +++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java @@ -11,8 +11,10 @@ import net.minecraft.block.material.Material; import net.minecraft.util.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; +import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; @@ -176,9 +178,10 @@ public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler { cycles++; - for(Entry entries : perWorld.entrySet()) { - World world = entries.getKey(); - RadPerWorld system = entries.getValue(); + for(WorldServer world : DimensionManager.getWorlds()) { //only updates loaded worlds + + RadPerWorld system = perWorld.get(world); + if(system == null) continue; int rebuildAllowance = 25; diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper.png index 258a60867..7c5cd06f8 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_bl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_bl.png index 1b6fdcb1a..992f81da1 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_bl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_bl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_br.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_br.png index a6d884bee..e0e3f2d87 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_br.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_br.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_tl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_tl.png index 9ce5b3466..2424e7f15 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_tl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_tl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_tr.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_tr.png index d89bd1753..cb14afd5e 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_tr.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_curve_tr.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_end.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_end.png index ed3dabe63..e93b0eeea 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_end.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_end.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction.png deleted file mode 100644 index 011c1e47d..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_0.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_0.png new file mode 100644 index 000000000..ec1fc103c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_0.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_1.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_1.png new file mode 100644 index 000000000..c9012efbd Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_1.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_2.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_2.png new file mode 100644 index 000000000..171b3c0b4 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_2.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_3.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_3.png new file mode 100644 index 000000000..02c08f0fc Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_3.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_4.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_4.png new file mode 100644 index 000000000..6d74263ec Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_junction_4.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_straight.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_straight.png index 1c413b9dc..21c9779b8 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_straight.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_copper_straight.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust.png index ab1816ba5..b35129b64 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_bl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_bl.png index 48dc1e6b8..24d68d1e6 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_bl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_bl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_br.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_br.png index 51129d041..a3326e99b 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_br.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_br.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_tl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_tl.png index 6a7379597..f309e8de5 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_tl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_tl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_tr.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_tr.png index 846ec559e..dfd0747a0 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_tr.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_curve_tr.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_end.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_end.png index 2065be57b..9d954e1c7 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_end.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_end.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_0.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_0.png new file mode 100644 index 000000000..62714bdbb Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_0.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_1.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_1.png new file mode 100644 index 000000000..718ff2d9e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_1.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_2.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_2.png new file mode 100644 index 000000000..5422296f6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_2.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_3.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_3.png new file mode 100644 index 000000000..d8814f63e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_3.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_4.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_4.png new file mode 100644 index 000000000..7f1ba80d8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_junction_4.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_straight.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_straight.png index f6a5ed43e..f76dd0378 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_straight.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_exhaust_straight.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver.png index 63002d448..2e552086b 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_bl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_bl.png index cbfc0f897..3f9efab8e 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_bl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_bl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_br.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_br.png index a18dd32fc..ecb91be52 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_br.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_br.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_tl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_tl.png index 304d273ed..9136999aa 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_tl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_tl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_tr.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_tr.png index 2db735758..704acd60c 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_tr.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_curve_tr.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_end.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_end.png index b0cb42c95..24284ee8f 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_end.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_end.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction.png deleted file mode 100644 index 2ce589063..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_0.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_0.png new file mode 100644 index 000000000..b519a48da Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_0.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_1.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_1.png new file mode 100644 index 000000000..265364ee7 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_1.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_2.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_2.png new file mode 100644 index 000000000..86b1aa4fc Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_2.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_3.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_3.png new file mode 100644 index 000000000..7916c63a6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_3.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_4.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_4.png new file mode 100644 index 000000000..3e6b7e9f2 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_junction_4.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_straight.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_straight.png index d8a5699bf..d051e9354 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_straight.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_silver_straight.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white.png new file mode 100644 index 000000000..391bc0a0d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_bl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_bl.png index 586ca4d1a..94cfc0ecb 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_bl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_bl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_br.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_br.png index 1883702b0..b2c75f853 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_br.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_br.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_tl.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_tl.png index e79b0a583..2684f8677 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_tl.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_tl.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_tr.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_tr.png index 1732c7916..dd96f902b 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_tr.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_curve_tr.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_end.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_end.png index 484764a50..3eebf73c6 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_end.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_end.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction.png deleted file mode 100644 index 36e78e712..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_0.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_0.png new file mode 100644 index 000000000..35019f1d8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_0.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_1.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_1.png new file mode 100644 index 000000000..3dcf36521 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_1.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_2.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_2.png new file mode 100644 index 000000000..2ac37ec44 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_2.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_3.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_3.png new file mode 100644 index 000000000..c188b753f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_3.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_4.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_4.png new file mode 100644 index 000000000..080929179 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_junction_4.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_straight.png b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_straight.png index 636913932..a76af87a1 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/boxduct_white_straight.png and b/src/main/resources/assets/hbm/textures/blocks/boxduct_white_straight.png differ