diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index 0fd842e3f..6287b0408 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -467,8 +467,8 @@ class CableBuilder { // Dense cables show used channels in groups of 4, rounded up channels = (int) ((channels + 3) / 4) / (AEConfig.instance().getDenseChannelCapacity() / 32); - TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels); - TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); + TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForDenseChannels(channels); + TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForDenseChannels(channels); // Render the channel indicators brightly lit at night cubeBuilder.setRenderFullBright(true); @@ -493,7 +493,7 @@ class CableBuilder { TextureAtlasSprite texture = this.connectionTextures.get(AECableType.DENSE_COVERED).get(cableColor); cubeBuilder.setTexture(texture); - setStraightCableUVs(cubeBuilder, facing, 5, 11); + setStraightCableUVs(cubeBuilder, facing, 3, 13); addStraightDenseCableSizedCube(facing, cubeBuilder); } @@ -504,15 +504,15 @@ class CableBuilder { TextureAtlasSprite texture = this.connectionTextures.get(AECableType.DENSE_SMART).get(cableColor); cubeBuilder.setTexture(texture); - setStraightCableUVs(cubeBuilder, facing, 5, 11); + setStraightCableUVs(cubeBuilder, facing, 3, 13); addStraightDenseCableSizedCube(facing, cubeBuilder); // Dense cables show used channels in groups of 4, rounded up channels = (int) ((channels + 3) / 4) / (AEConfig.instance().getDenseChannelCapacity() / 32); - TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels); - TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); + TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForDenseChannels(channels); + TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForDenseChannels(channels); // Render the channel indicators brightly lit at night cubeBuilder.setRenderFullBright(true); @@ -556,14 +556,14 @@ class CableBuilder { case DOWN: case UP: cubeBuilder.setUvRotation(EnumFacing.EAST, 3); - cubeBuilder.addCube(3, 0, 3, 13, 16, 13); + cubeBuilder.addCube(3, -0.01f, 3, 13, 16.01f, 13); cubeBuilder.setUvRotation(EnumFacing.EAST, 0); break; case EAST: case WEST: cubeBuilder.setUvRotation(EnumFacing.SOUTH, 3); cubeBuilder.setUvRotation(EnumFacing.NORTH, 3); - cubeBuilder.addCube(0, 3, 3, 16, 13, 13); + cubeBuilder.addCube(-0.01f, 3, 3, 16.01f, 13, 13); cubeBuilder.setUvRotation(EnumFacing.SOUTH, 0); cubeBuilder.setUvRotation(EnumFacing.NORTH, 0); break; @@ -571,7 +571,7 @@ class CableBuilder { case SOUTH: cubeBuilder.setUvRotation(EnumFacing.EAST, 3); cubeBuilder.setUvRotation(EnumFacing.WEST, 3); - cubeBuilder.addCube(3, 3, 0, 13, 13, 16); + cubeBuilder.addCube(3, 3, -0.01f, 13, 13, 16.01f); cubeBuilder.setUvRotation(EnumFacing.EAST, 0); cubeBuilder.setUvRotation(EnumFacing.WEST, 0); break; @@ -611,14 +611,14 @@ class CableBuilder { case DOWN: case UP: cubeBuilder.setUvRotation(EnumFacing.EAST, 3); - cubeBuilder.addCube(5, 0, 5, 11, 16, 11); + cubeBuilder.addCube(5, -0.01f, 5, 11, 16.01f, 11); cubeBuilder.setUvRotation(EnumFacing.EAST, 0); break; case EAST: case WEST: cubeBuilder.setUvRotation(EnumFacing.SOUTH, 3); cubeBuilder.setUvRotation(EnumFacing.NORTH, 3); - cubeBuilder.addCube(0, 5, 5, 16, 11, 11); + cubeBuilder.addCube(-0.01f, 5, 5, 16.01f, 11, 11); cubeBuilder.setUvRotation(EnumFacing.SOUTH, 0); cubeBuilder.setUvRotation(EnumFacing.NORTH, 0); break; @@ -626,7 +626,7 @@ class CableBuilder { case SOUTH: cubeBuilder.setUvRotation(EnumFacing.EAST, 3); cubeBuilder.setUvRotation(EnumFacing.WEST, 3); - cubeBuilder.addCube(5, 5, 0, 11, 11, 16); + cubeBuilder.addCube(5, 5, -0.01f, 11, 11, 16.01f); cubeBuilder.setUvRotation(EnumFacing.EAST, 0); cubeBuilder.setUvRotation(EnumFacing.WEST, 0); break; @@ -702,6 +702,7 @@ class CableBuilder { } Collections.addAll(locations, SmartCableTextures.SMART_CHANNELS_TEXTURES); + Collections.addAll(locations, SmartCableTextures.DENSE_SMART_CHANNELS_TEXTURES); return locations; } diff --git a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java index 3e932812e..2378a4fbd 100644 --- a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java +++ b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java @@ -32,20 +32,43 @@ import java.util.function.Function; */ public class SmartCableTextures { - public static final ResourceLocation[] SMART_CHANNELS_TEXTURES = {new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_00"), - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_01"), new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_02"), - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_03"), new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_04"), - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_10"), new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_11"), - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_12"), new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_13"), - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_14") + public static final ResourceLocation[] SMART_CHANNELS_TEXTURES = { + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_00"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_01"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_02"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_03"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_04"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_10"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_11"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_12"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_13"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_14"), }; // Textures used to display channels on smart cables. There's two sets of 5 textures each, and // one of each set are composed together to get even/odd colored channels private final TextureAtlasSprite[] textures; + public static final ResourceLocation[] DENSE_SMART_CHANNELS_TEXTURES = { + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_00"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_01"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_02"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_03"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_04"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_10"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_11"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_12"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_13"), + new ResourceLocation(AppEng.MOD_ID, "parts/cable/dense_smart/channels_14"), + }; + + // Textures used to display channels on dense smart cables. There's two sets of 5 textures each, and + // one of each set are composed together to get even/odd colored channels + private final TextureAtlasSprite[] denseTextures; + public SmartCableTextures(Function bakedTextureGetter) { this.textures = Arrays.stream(SMART_CHANNELS_TEXTURES).map(bakedTextureGetter::apply).toArray(TextureAtlasSprite[]::new); + this.denseTextures = Arrays.stream(DENSE_SMART_CHANNELS_TEXTURES).map(bakedTextureGetter::apply).toArray(TextureAtlasSprite[]::new); } /** @@ -61,8 +84,18 @@ public class SmartCableTextures { } } + public TextureAtlasSprite getOddTextureForDenseChannels(int channels) { + if (channels < 0) { + return this.denseTextures[0]; + } else if (channels <= 4) { + return this.denseTextures[channels]; + } else { + return this.denseTextures[4]; + } + } + /** - * The odd variant is used for displaying channels 5-8 as in use. + * The even variant is used for displaying channels 5-8 as in use. */ public TextureAtlasSprite getEvenTextureForChannels(int channels) { if (channels < 5) { @@ -73,4 +106,14 @@ public class SmartCableTextures { return this.textures[9]; } } + + public TextureAtlasSprite getEvenTextureForDenseChannels(int channels) { + if (channels < 5) { + return this.denseTextures[5]; + } else if (channels <= 8) { + return this.denseTextures[1 + channels]; + } else { + return this.denseTextures[9]; + } + } } diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 29366dd95..882799487 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -976,7 +976,10 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I // Check if the adjacent TE is a cable bus or not if (adjacentTe instanceof IPartHost) { - renderState.getCableBusAdjacent().add(facing); + IPartHost host = (IPartHost) adjacentTe; + if (host.getPart(facing) != null) { + renderState.getCableBusAdjacent().add(facing); + } } renderState.getConnectionTypes().put(facing, connectionType); diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_base.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_base.json index 6b60f1f22..281c63213 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_covered_base.json @@ -3,70 +3,32 @@ "elements": [ { "name": "Base", - "from": [ - 4.0, - 4.0, - 2.0 - ], - "to": [ - 12.0, - 12.0, - 14.0 - ], + "from": [4.0, 4.0, 2.0], + "to": [12.0, 12.0, 14.0], "faces": { "north": { "texture": "#base", - "uv": [ - 4.0, - 4.0, - 12.0, - 11.0 - ] + "uv": [6.0, 6.0, 10.0, 10.0] }, "east": { "texture": "#base", - "uv": [ - 0.0, - 4.0, - 4.0, - 12.0 - ] + "uv": [0.0, 4.0, 4.0, 12.0] }, "south": { "texture": "#base", - "uv": [ - 11.0, - 4.0, - 4.0, - 12.0 - ] + "uv": [10.0, 6.0, 6.0, 10.0] }, "west": { "texture": "#base", - "uv": [ - 4.0, - 4.0, - 0.0, - 12.0 - ] + "uv": [4.0, 4.0, 0.0, 12.0] }, "up": { "texture": "#base", - "uv": [ - 4.0, - 0.0, - 12.0, - 5.0 - ] + "uv": [4.0, 0.0, 12.0, 5.0] }, "down": { "texture": "#base", - "uv": [ - 4.0, - 12.0, - 12.0, - 16.0 - ] + "uv": [4.0, 12.0, 12.0, 16.0] } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_base.json b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_base.json index 1cd2bcd56..f6c767044 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_smart_base.json @@ -6,139 +6,63 @@ "elements": [ { "name": "Base", - "from": [ - 4.0, - 4.0, - 2.0 - ], - "to": [ - 12.0, - 12.0, - 14.0 - ], + "from": [4.0, 4.0, 2.0], + "to": [12.0, 12.0, 14.0], "faces": { "north": { "texture": "#base", - "uv": [ - 4.0, - 4.0, - 12.0, - 11.0 - ] + "uv": [6.0, 6.0, 10.0, 10.0] }, "east": { "texture": "#base", - "uv": [ - 0.0, - 4.0, - 4.0, - 12.0 - ] + "uv": [0.0, 4.0, 4.0, 12.0] }, "south": { "texture": "#base", - "uv": [ - 11.0, - 4.0, - 4.0, - 12.0 - ] + "uv": [10.0, 6.0, 6.0, 10.0] }, "west": { "texture": "#base", - "uv": [ - 4.0, - 4.0, - 0.0, - 12.0 - ] + "uv": [4.0, 4.0, 0.0, 12.0] }, "up": { "texture": "#base", - "uv": [ - 4.0, - 0.0, - 12.0, - 5.0 - ] + "uv": [4.0, 0.0, 12.0, 5.0] }, "down": { "texture": "#base", - "uv": [ - 4.0, - 12.0, - 12.0, - 16.0 - ] + "uv": [4.0, 12.0, 12.0, 16.0] } } }, { "name": "Channels", - "from": [ - 4.0, - 4.0, - 2.0 - ], - "to": [ - 12.0, - 12.0, - 14.0 - ], + "from": [4.0, 4.0, 2.0], + "to": [12.0, 12.0, 14.0], "faces": { "north": { "texture": "#channels", - "uv": [ - 5.0, - 5.0, - 11.0, - 11.0 - ] + "uv": [4.0, 4.0, 12.0, 12.0] }, "east": { "texture": "#channels", - "uv": [ - 0.0, - 5.0, - 5.0, - 11.0 - ] + "uv": [0.0, 4.0, 4.0, 12.0] }, "south": { "texture": "#channels", - "uv": [ - 11.0, - 5.0, - 5.0, - 11.0 - ] + "uv": [12.0, 4.0, 4.0, 12.0] }, "west": { "texture": "#channels", - "uv": [ - 5.0, - 5.0, - 0.0, - 11.0 - ] + "uv": [4.0, 4.0, 0.0, 12.0] }, "up": { "texture": "#channels", - "uv": [ - 5.0, - 0.0, - 11.0, - 5.0 - ] + "uv": [4.0, 0.0, 12.0, 4.0] }, "down": { "texture": "#channels", - "uv": [ - 5.0, - 11.0, - 11.0, - 16.0 - ] + "uv": [4.0, 12.0, 12.0, 16.0] } } } diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png index 4cad69b1c..75afebc7a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png index 3791536af..ba10c170c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png index 4c4406506..f61c5cbb2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png index 150f4b324..b7468ecbe 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png index b6388c913..f7d457695 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png index 1de704133..8ae84f2d6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png index a7f38dcba..55a404475 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png index 76b9163a6..95869125f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png index efb6a78c6..1c4d88c6c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png index 8fb1f84c0..8d3689f13 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png index 849a8f1dc..c20ef4032 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png index 7b7d9e8cb..f9fd5d0bf 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png index 8dd975777..d88606648 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png index dc5835385..967f08d05 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png index 3df34b6d3..31f1a6edb 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png index 104401125..2b02564ed 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png index 11f11dce8..601b3d7ea 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png index d63a978ca..b17a2b807 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png deleted file mode 100644 index d63a978ca..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png deleted file mode 100644 index c1c2d6d70..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png deleted file mode 100644 index c1c2d6d70..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png deleted file mode 100644 index e3b95105f..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png deleted file mode 100644 index e3b95105f..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png deleted file mode 100644 index e3b95105f..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png deleted file mode 100644 index e3b95105f..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png deleted file mode 100644 index 2cf5601ad..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png deleted file mode 100644 index 2cf5601ad..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png deleted file mode 100644 index 2cf5601ad..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png deleted file mode 100644 index 2cf5601ad..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png deleted file mode 100644 index d63a978ca..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png deleted file mode 100644 index 3eb6c342b..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png deleted file mode 100644 index 3eb6c342b..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png deleted file mode 100644 index 3eb6c342b..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png deleted file mode 100644 index 3eb6c342b..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png deleted file mode 100644 index ac6a20a1a..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png deleted file mode 100644 index ac6a20a1a..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png deleted file mode 100644 index ac6a20a1a..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png deleted file mode 100644 index ac6a20a1a..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png deleted file mode 100644 index a73015de9..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png deleted file mode 100644 index a73015de9..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png deleted file mode 100644 index d63a978ca..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png deleted file mode 100644 index a73015de9..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png deleted file mode 100644 index a73015de9..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png deleted file mode 100644 index 0d74dc97b..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png deleted file mode 100644 index 0bc8ce434..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png deleted file mode 100644 index 0bc8ce434..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png deleted file mode 100644 index 0bc8ce434..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png deleted file mode 100644 index 0bc8ce434..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png deleted file mode 100644 index c1c2d6d70..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png deleted file mode 100644 index c1c2d6d70..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png index ca759c719..c462a7762 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png index 0698a8b79..4e6fb5762 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png index 2c34472f0..8072057d0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_00.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_00.png new file mode 100644 index 000000000..f1164ba07 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_00.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_01.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_01.png new file mode 100644 index 000000000..2bfd92572 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_01.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_02.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_02.png new file mode 100644 index 000000000..536bfc276 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_02.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_03.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_03.png new file mode 100644 index 000000000..648336f58 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_03.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_04.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_04.png new file mode 100644 index 000000000..c6d290f41 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_04.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_10.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_10.png new file mode 100644 index 000000000..7f3b0227b Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_10.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_11.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_11.png new file mode 100644 index 000000000..80fd530f7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_11.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_12.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_12.png new file mode 100644 index 000000000..ba5193fac Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_12.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_13.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_13.png new file mode 100644 index 000000000..0c836c3d7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_13.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_14.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_14.png new file mode 100644 index 000000000..9afe29c8e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/channels_14.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png index b705d97f2..b7c3a5404 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png index bb86b7b1f..11793d93e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png index a5e7c48e5..78ec54ffd 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png index dc341da63..0767aebf0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png index 85918fc59..19f8453c7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png index 6b7164b9a..74066ea5f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png index 4d2097dab..998709234 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png index a4fe8a118..508b13723 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png index 84eeab90d..7ae1f9b30 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png index 44b6c5d4b..88896f6e5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png index a0a341b09..9024ad747 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png index dc47ab47c..3803e2fe0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png index 9ca58b2d4..d8f8a301d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png index dd04e23d8..e1f5411fb 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png differ