diff --git a/common/src/main/java/muramasa/antimatter/pipe/BlockCable.java b/common/src/main/java/muramasa/antimatter/pipe/BlockCable.java index 4817e32dd..aa7b9e78e 100644 --- a/common/src/main/java/muramasa/antimatter/pipe/BlockCable.java +++ b/common/src/main/java/muramasa/antimatter/pipe/BlockCable.java @@ -32,6 +32,7 @@ public class BlockCable> extends BlockPipe { + public static final int INSULATION_COLOR = 0x404040; public final boolean insulated; public BlockCable(T type, PipeSize size, boolean insulated) { @@ -40,12 +41,12 @@ public BlockCable(T type, PipeSize size, boolean insulated) { String prefix = insulated ? "cable" : "wire"; this.side = new Texture(Ref.ID, "block/pipe/" + prefix + "_side"); this.faces = new Texture[]{ - new Texture(Ref.ID, "block/pipe/" + prefix + "_vtiny"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_tiny"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_small"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_normal"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_large"), - new Texture(Ref.ID, "block/pipe/" + prefix + "_huge") + new Texture(Ref.ID, "block/pipe/" + "wire_vtiny"), + new Texture(Ref.ID, "block/pipe/" + "wire_tiny"), + new Texture(Ref.ID, "block/pipe/" + "wire_small"), + new Texture(Ref.ID, "block/pipe/" + "wire_normal"), + new Texture(Ref.ID, "block/pipe/" + "wire_large"), + new Texture(Ref.ID, "block/pipe/" + "wire_huge") }; } @@ -71,7 +72,7 @@ public int getBlockColor(BlockState state, @Nullable BlockGetter world, @Nullabl if (!(state.getBlock() instanceof BlockCable) && world == null || pos == null) return -1; BlockEntityPipe pipe = getTilePipe(world, pos); if (insulated && pipe != null && pipe.getPipeColor() != -1 && i == 0) return pipe.getPipeColor(); - if (insulated) return i == 1 ? getRGB() : -1; + if (insulated) return i == 1 ? getRGB() : i == 0 ? INSULATION_COLOR : -1; return i == 0 || i == 1 ? getRGB() : -1; } @@ -80,7 +81,7 @@ public int getItemColor(ItemStack stack, @Nullable Block block, int i) { if (insulated && stack.getTag() != null && stack.getTag().contains(Ref.KEY_PIPE_TILE_COLOR) && i == 0){ return stack.getTag().getInt(Ref.KEY_PIPE_TILE_COLOR); } - return insulated ? i == 1 ? getRGB() : -1 : getRGB(); + return insulated ? i == 1 ? getRGB() : i == 0 ? INSULATION_COLOR : -1 : getRGB(); } @Override diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_huge.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_huge.png index d353e3ba5..52345490d 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_huge.png and b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_huge.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_large.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_large.png index 9b24c0a20..85a47f067 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_large.png and b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_large.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_normal.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_normal.png index 0fdcae144..3da8f1dc9 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_normal.png and b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_normal.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_side.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_side.png index f9f3cf016..fb836d4ef 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_side.png and b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_side.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_small.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_small.png index 60f57c1e6..42a71d5e5 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_small.png and b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_small.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_tiny.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_tiny.png index 239d5ee71..890bff90a 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_tiny.png and b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_tiny.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_vtiny.png b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_vtiny.png index 239d5ee71..54c6661b8 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_vtiny.png and b/common/src/main/resources/assets/antimatter/textures/block/pipe/cable_vtiny.png differ