diff --git a/src/main/java/appeng/block/networking/ControllerBlock.java b/src/main/java/appeng/block/networking/ControllerBlock.java index 31428591311..026e112ba45 100644 --- a/src/main/java/appeng/block/networking/ControllerBlock.java +++ b/src/main/java/appeng/block/networking/ControllerBlock.java @@ -59,7 +59,7 @@ public String getSerializedName() { * have the usual sub-states. */ public enum ControllerRenderType implements StringRepresentable { - block, column_x, column_y, column_z, inside_a, inside_b; + block_a, block_b, column_x_a, column_x_b, column_y_a, column_y_b, column_z_a, column_z_b, inside_a, inside_b; @Override public String getSerializedName() { @@ -77,7 +77,7 @@ public String getSerializedName() { public ControllerBlock() { super(metalProps().strength(6)); this.registerDefaultState(this.defaultBlockState().setValue(CONTROLLER_STATE, ControllerBlockState.offline) - .setValue(CONTROLLER_TYPE, ControllerRenderType.block)); + .setValue(CONTROLLER_TYPE, ControllerRenderType.block_a)); // TODO this could be block_b theoretically } @Override @@ -107,7 +107,7 @@ public BlockState updateShape(BlockState state, Direction facing, BlockState fac private BlockState getControllerType(BlockState baseState, LevelAccessor level, BlockPos pos) { // Only used for columns, really - ControllerRenderType type = ControllerRenderType.block; + ControllerRenderType type = ControllerRenderType.block_a; int x = pos.getX(); int y = pos.getY(); @@ -118,22 +118,40 @@ private BlockState getControllerType(BlockState baseState, LevelAccessor level, final boolean yy = isController(level, x, y - 1, z) && isController(level, x, y + 1, z); final boolean zz = isController(level, x, y, z - 1) && isController(level, x, y, z + 1); + // While i'd like this to be based on the blockstate randomization feature, this + // generates an alternating pattern based on level position, so this is not 100% doable with blockstates. + final int v = (Math.abs(x) + Math.abs(y) + Math.abs(z)) % 2; + if (xx && !yy && !zz) { - type = ControllerRenderType.column_x; + if (v == 0) { + type = ControllerRenderType.column_x_a; + } else { + type = ControllerRenderType.column_x_b; + } } else if (!xx && yy && !zz) { - type = ControllerRenderType.column_y; + if (v == 0) { + type = ControllerRenderType.column_y_a; + } else { + type = ControllerRenderType.column_y_b; + } } else if (!xx && !yy && zz) { - type = ControllerRenderType.column_z; + if (v == 0) { + type = ControllerRenderType.column_z_a; + } else { + type = ControllerRenderType.column_z_b; + } } else if ((xx ? 1 : 0) + (yy ? 1 : 0) + (zz ? 1 : 0) >= 2) { - final int v = (Math.abs(x) + Math.abs(y) + Math.abs(z)) % 2; - - // While i'd like this to be based on the blockstate randomization feature, this - // generates an alternating pattern based on level position, so this is not 100% doable with blockstates. if (v == 0) { type = ControllerRenderType.inside_a; } else { type = ControllerRenderType.inside_b; } + } else { + if (v == 0) { + type = ControllerRenderType.block_a; + } else { + type = ControllerRenderType.block_b; + } } return baseState.setValue(CONTROLLER_TYPE, type); diff --git a/src/main/resources/assets/ae2/blockstates/controller.json b/src/main/resources/assets/ae2/blockstates/controller.json index 2a9a811134d..18c2e35fbed 100644 --- a/src/main/resources/assets/ae2/blockstates/controller.json +++ b/src/main/resources/assets/ae2/blockstates/controller.json @@ -2,119 +2,236 @@ "multipart": [ { "apply": { - "model": "ae2:block/controller/controller_block_offline" + "model": "ae2:block/controller/controller_block_offline_a" }, "when": { "state": "offline", - "type": "block" + "type": "block_a" } }, { "apply": { - "model": "ae2:block/controller/controller_block_online" + "model": "ae2:block/controller/controller_block_offline_b" + }, + "when": { + "state": "offline", + "type": "block_b" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_block_online_a" + }, + "when": { + "state": "online", + "type": "block_a" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_block_online_b" }, "when": { "state": "online", - "type": "block" + "type": "block_b" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_block_conflicted_a" + }, + "when": { + "state": "conflicted", + "type": "block_a" } }, { "apply": { - "model": "ae2:block/controller/controller_block_conflicted" + "model": "ae2:block/controller/controller_block_conflicted_b" }, "when": { "state": "conflicted", - "type": "block" + "type": "block_b" } }, { "apply": { - "model": "ae2:block/controller/controller_column_offline", + "model": "ae2:block/controller/controller_column_offline_a", "x": 90, "y": 90 }, "when": { "state": "offline", - "type": "column_x" + "type": "column_x_a" } }, { "apply": { - "model": "ae2:block/controller/controller_column_offline" + "model": "ae2:block/controller/controller_column_offline_a" }, "when": { "state": "offline", - "type": "column_y" + "type": "column_y_a" } }, { "apply": { - "model": "ae2:block/controller/controller_column_offline", + "model": "ae2:block/controller/controller_column_offline_a", "x": 90 }, "when": { "state": "offline", - "type": "column_z" + "type": "column_z_a" } }, { "apply": { - "model": "ae2:block/controller/controller_column_online", + "model": "ae2:block/controller/controller_column_offline_b", + "x": 90, + "y": 90 + }, + "when": { + "state": "offline", + "type": "column_x_b" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_offline_b" + }, + "when": { + "state": "offline", + "type": "column_y_b" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_offline_b", + "x": 90 + }, + "when": { + "state": "offline", + "type": "column_z_b" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_online_a", "x": 90, "y": 90 }, "when": { "state": "online", - "type": "column_x" + "type": "column_x_a" } }, { "apply": { - "model": "ae2:block/controller/controller_column_online" + "model": "ae2:block/controller/controller_column_online_a" }, "when": { "state": "online", - "type": "column_y" + "type": "column_y_a" } }, { "apply": { - "model": "ae2:block/controller/controller_column_online", + "model": "ae2:block/controller/controller_column_online_a", "x": 90 }, "when": { "state": "online", - "type": "column_z" + "type": "column_z_a" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_online_b", + "x": 90, + "y": 90 + }, + "when": { + "state": "online", + "type": "column_x_b" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_online_b" + }, + "when": { + "state": "online", + "type": "column_y_b" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_online_b", + "x": 90 + }, + "when": { + "state": "online", + "type": "column_z_b" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_conflicted_a", + "x": 90, + "y": 90 + }, + "when": { + "state": "conflicted", + "type": "column_x_a" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_conflicted_a" + }, + "when": { + "state": "conflicted", + "type": "column_y_a" + } + }, + { + "apply": { + "model": "ae2:block/controller/controller_column_conflicted_a", + "x": 90 + }, + "when": { + "state": "conflicted", + "type": "column_z_a" } }, { "apply": { - "model": "ae2:block/controller/controller_column_conflicted", + "model": "ae2:block/controller/controller_column_conflicted_b", "x": 90, "y": 90 }, "when": { "state": "conflicted", - "type": "column_x" + "type": "column_x_b" } }, { "apply": { - "model": "ae2:block/controller/controller_column_conflicted" + "model": "ae2:block/controller/controller_column_conflicted_b" }, "when": { "state": "conflicted", - "type": "column_y" + "type": "column_y_b" } }, { "apply": { - "model": "ae2:block/controller/controller_column_conflicted", + "model": "ae2:block/controller/controller_column_conflicted_b", "x": 90 }, "when": { "state": "conflicted", - "type": "column_z" + "type": "column_z_b" } }, { diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted_a.json b/src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted_a.json new file mode 100644 index 00000000000..f8fe0f98173 --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted_a.json @@ -0,0 +1,7 @@ +{ + "parent": "ae2:block/controller/controller_block_lights", + "textures": { + "block": "ae2:block/controller_powered", + "lights": "ae2:block/controller_conflict_a" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted_b.json b/src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted_b.json new file mode 100644 index 00000000000..b52f5ffbde0 --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted_b.json @@ -0,0 +1,7 @@ +{ + "parent": "ae2:block/controller/controller_block_lights", + "textures": { + "block": "ae2:block/controller_powered", + "lights": "ae2:block/controller_conflict_b" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_block_offline.json b/src/main/resources/assets/ae2/models/block/controller/controller_block_offline_a.json similarity index 60% rename from src/main/resources/assets/ae2/models/block/controller/controller_block_offline.json rename to src/main/resources/assets/ae2/models/block/controller/controller_block_offline_a.json index 70ea229dec3..10713666c9d 100644 --- a/src/main/resources/assets/ae2/models/block/controller/controller_block_offline.json +++ b/src/main/resources/assets/ae2/models/block/controller/controller_block_offline_a.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "ae2:block/controller" + "all": "ae2:block/controller_a" } } diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_block_offline_b.json b/src/main/resources/assets/ae2/models/block/controller/controller_block_offline_b.json new file mode 100644 index 00000000000..00c8b14ba54 --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_block_offline_b.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "ae2:block/controller_b" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted.json b/src/main/resources/assets/ae2/models/block/controller/controller_block_online_a.json similarity index 73% rename from src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted.json rename to src/main/resources/assets/ae2/models/block/controller/controller_block_online_a.json index cb813e899c7..b613b866a64 100644 --- a/src/main/resources/assets/ae2/models/block/controller/controller_block_conflicted.json +++ b/src/main/resources/assets/ae2/models/block/controller/controller_block_online_a.json @@ -2,6 +2,6 @@ "parent": "ae2:block/controller/controller_block_lights", "textures": { "block": "ae2:block/controller_powered", - "lights": "ae2:block/controller_conflict" + "lights": "ae2:block/controller_lights_a" } } diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_block_online.json b/src/main/resources/assets/ae2/models/block/controller/controller_block_online_b.json similarity index 73% rename from src/main/resources/assets/ae2/models/block/controller/controller_block_online.json rename to src/main/resources/assets/ae2/models/block/controller/controller_block_online_b.json index f6c11a74f21..67262225698 100644 --- a/src/main/resources/assets/ae2/models/block/controller/controller_block_online.json +++ b/src/main/resources/assets/ae2/models/block/controller/controller_block_online_b.json @@ -2,6 +2,6 @@ "parent": "ae2:block/controller/controller_block_lights", "textures": { "block": "ae2:block/controller_powered", - "lights": "ae2:block/controller_lights" + "lights": "ae2:block/controller_lights_b" } } diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted.json deleted file mode 100644 index 9126ebebaa3..00000000000 --- a/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "block": "ae2:block/controller_column_powered", - "lights": "ae2:block/controller_column_conflict", - "particle": "ae2:block/controller" - }, - "render_type": "cutout", - "elements": [ - { - "faces": { - "down": { - "texture": "#lights", - "uv": [0, 0, 16, 16], - "unlit": true - }, - "east": { - "texture": "#lights", - "uv": [0, 0, 16, 16], - "unlit": true - }, - "north": { - "texture": "#lights", - "uv": [0, 0, 16, 16], - "unlit": true - }, - "south": { - "texture": "#lights", - "uv": [0, 0, 16, 16], - "unlit": true - }, - "up": { - "texture": "#lights", - "uv": [0, 0, 16, 16], - "unlit": true - }, - "west": { - "texture": "#lights", - "uv": [0, 0, 16, 16], - "unlit": true - } - }, - "from": [0, 0, 0], - "shade": false, - "to": [16, 16, 16] - }, - { - "faces": { - "down": { - "texture": "#block", - "uv": [0, 0, 16, 16] - }, - "east": { - "texture": "#block", - "uv": [0, 0, 16, 16] - }, - "north": { - "texture": "#block", - "uv": [0, 0, 16, 16] - }, - "south": { - "texture": "#block", - "uv": [0, 0, 16, 16] - }, - "up": { - "texture": "#block", - "uv": [0, 0, 16, 16] - }, - "west": { - "texture": "#block", - "uv": [0, 0, 16, 16] - } - }, - "from": [0, 0, 0], - "to": [16, 16, 16] - } - ] -} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted_a.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted_a.json new file mode 100644 index 00000000000..63fa4daf8a7 --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted_a.json @@ -0,0 +1,7 @@ +{ + "parent": "ae2:block/controller/controller_column_lights", + "textures": { + "block": "ae2:block/controller_column_powered", + "lights": "ae2:block/controller_column_conflict_a" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted_b.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted_b.json new file mode 100644 index 00000000000..741fd66c5f8 --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted_b.json @@ -0,0 +1,7 @@ +{ + "parent": "ae2:block/controller/controller_column_lights", + "textures": { + "block": "ae2:block/controller_column_powered", + "lights": "ae2:block/controller_column_conflict_b" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_online.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_lights.json similarity index 93% rename from src/main/resources/assets/ae2/models/block/controller/controller_column_online.json rename to src/main/resources/assets/ae2/models/block/controller/controller_column_lights.json index a3c66c7fd32..f700af39f6a 100644 --- a/src/main/resources/assets/ae2/models/block/controller/controller_column_online.json +++ b/src/main/resources/assets/ae2/models/block/controller/controller_column_lights.json @@ -1,8 +1,6 @@ { "parent": "block/block", "textures": { - "block": "ae2:block/controller_column_powered", - "lights": "ae2:block/controller_column_lights", "particle": "ae2:block/controller" }, "render_type": "cutout", diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_offline.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_offline.json deleted file mode 100644 index f88d5b0268d..00000000000 --- a/src/main/resources/assets/ae2/models/block/controller/controller_column_offline.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "ae2:block/controller_column", - "end": "ae2:block/controller" - } -} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_offline_a.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_offline_a.json new file mode 100644 index 00000000000..ae2ddc0a2d6 --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_column_offline_a.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "ae2:block/controller_column_a", + "end": "ae2:block/controller_a" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_offline_b.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_offline_b.json new file mode 100644 index 00000000000..321ce0d675e --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_column_offline_b.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "ae2:block/controller_column_b", + "end": "ae2:block/controller_b" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_online_a.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_online_a.json new file mode 100644 index 00000000000..191a627603b --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_column_online_a.json @@ -0,0 +1,7 @@ +{ + "parent": "ae2:block/controller/controller_column_lights", + "textures": { + "block": "ae2:block/controller_column_powered", + "lights": "ae2:block/controller_column_lights_a" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_online_b.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_online_b.json new file mode 100644 index 00000000000..20aeb2f0588 --- /dev/null +++ b/src/main/resources/assets/ae2/models/block/controller/controller_column_online_b.json @@ -0,0 +1,7 @@ +{ + "parent": "ae2:block/controller/controller_column_lights", + "textures": { + "block": "ae2:block/controller_column_powered", + "lights": "ae2:block/controller_column_lights_b" + } +} diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_inside_a_conflicted.json b/src/main/resources/assets/ae2/models/block/controller/controller_inside_a_conflicted.json index b9320a03b2a..9a6524dfdb2 100644 --- a/src/main/resources/assets/ae2/models/block/controller/controller_inside_a_conflicted.json +++ b/src/main/resources/assets/ae2/models/block/controller/controller_inside_a_conflicted.json @@ -2,6 +2,6 @@ "parent": "ae2:block/controller/controller_block_lights", "textures": { "block": "ae2:block/controller_inside_a_powered", - "lights": "ae2:block/controller_conflict" + "lights": "ae2:block/controller_conflict_a" } } diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_inside_b_conflicted.json b/src/main/resources/assets/ae2/models/block/controller/controller_inside_b_conflicted.json index 2f36e54e263..b8c43ae41e7 100644 --- a/src/main/resources/assets/ae2/models/block/controller/controller_inside_b_conflicted.json +++ b/src/main/resources/assets/ae2/models/block/controller/controller_inside_b_conflicted.json @@ -2,6 +2,6 @@ "parent": "ae2:block/controller/controller_block_lights", "textures": { "block": "ae2:block/controller_inside_b_powered", - "lights": "ae2:block/controller_conflict" + "lights": "ae2:block/controller_conflict_b" } } diff --git a/src/main/resources/assets/ae2/models/item/controller.json b/src/main/resources/assets/ae2/models/item/controller.json index 8552a05cdb8..258b64b81df 100644 --- a/src/main/resources/assets/ae2/models/item/controller.json +++ b/src/main/resources/assets/ae2/models/item/controller.json @@ -1,3 +1,3 @@ { - "parent": "ae2:block/controller/controller_block_offline" + "parent": "ae2:block/controller/controller_block_offline_a" } diff --git a/src/main/resources/assets/ae2/textures/block/controller_a.png b/src/main/resources/assets/ae2/textures/block/controller_a.png new file mode 100644 index 00000000000..7f5d83c4f3e Binary files /dev/null and b/src/main/resources/assets/ae2/textures/block/controller_a.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller.png b/src/main/resources/assets/ae2/textures/block/controller_b.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/controller.png rename to src/main/resources/assets/ae2/textures/block/controller_b.png diff --git a/src/main/resources/assets/ae2/textures/block/controller_column_a.png b/src/main/resources/assets/ae2/textures/block/controller_column_a.png new file mode 100644 index 00000000000..9c6cc92685c Binary files /dev/null and b/src/main/resources/assets/ae2/textures/block/controller_column_a.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_column.png b/src/main/resources/assets/ae2/textures/block/controller_column_b.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/controller_column.png rename to src/main/resources/assets/ae2/textures/block/controller_column_b.png diff --git a/src/main/resources/assets/ae2/textures/block/controller_column_conflict_a.png b/src/main/resources/assets/ae2/textures/block/controller_column_conflict_a.png new file mode 100644 index 00000000000..2c7c03117ee Binary files /dev/null and b/src/main/resources/assets/ae2/textures/block/controller_column_conflict_a.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_column_conflict.png b/src/main/resources/assets/ae2/textures/block/controller_column_conflict_b.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/controller_column_conflict.png rename to src/main/resources/assets/ae2/textures/block/controller_column_conflict_b.png diff --git a/src/main/resources/assets/ae2/textures/block/controller_column_lights_a.png b/src/main/resources/assets/ae2/textures/block/controller_column_lights_a.png new file mode 100644 index 00000000000..8907273449e Binary files /dev/null and b/src/main/resources/assets/ae2/textures/block/controller_column_lights_a.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_column_lights.png.mcmeta b/src/main/resources/assets/ae2/textures/block/controller_column_lights_a.png.mcmeta similarity index 100% rename from src/main/resources/assets/ae2/textures/block/controller_column_lights.png.mcmeta rename to src/main/resources/assets/ae2/textures/block/controller_column_lights_a.png.mcmeta diff --git a/src/main/resources/assets/ae2/textures/block/controller_column_lights.png b/src/main/resources/assets/ae2/textures/block/controller_column_lights_b.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/controller_column_lights.png rename to src/main/resources/assets/ae2/textures/block/controller_column_lights_b.png diff --git a/src/main/resources/assets/ae2/textures/block/controller_lights.png.mcmeta b/src/main/resources/assets/ae2/textures/block/controller_column_lights_b.png.mcmeta similarity index 100% rename from src/main/resources/assets/ae2/textures/block/controller_lights.png.mcmeta rename to src/main/resources/assets/ae2/textures/block/controller_column_lights_b.png.mcmeta diff --git a/src/main/resources/assets/ae2/textures/block/controller_conflict_a.png b/src/main/resources/assets/ae2/textures/block/controller_conflict_a.png new file mode 100644 index 00000000000..a35efbc1925 Binary files /dev/null and b/src/main/resources/assets/ae2/textures/block/controller_conflict_a.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_conflict.png b/src/main/resources/assets/ae2/textures/block/controller_conflict_b.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/controller_conflict.png rename to src/main/resources/assets/ae2/textures/block/controller_conflict_b.png diff --git a/src/main/resources/assets/ae2/textures/block/controller_inside_a.png b/src/main/resources/assets/ae2/textures/block/controller_inside_a.png index fe0250946c3..5adeaec8f19 100644 Binary files a/src/main/resources/assets/ae2/textures/block/controller_inside_a.png and b/src/main/resources/assets/ae2/textures/block/controller_inside_a.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_inside_a_powered.png b/src/main/resources/assets/ae2/textures/block/controller_inside_a_powered.png index 54a7a311a24..3bada304095 100644 Binary files a/src/main/resources/assets/ae2/textures/block/controller_inside_a_powered.png and b/src/main/resources/assets/ae2/textures/block/controller_inside_a_powered.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_inside_b.png b/src/main/resources/assets/ae2/textures/block/controller_inside_b.png index 95ef92eda7b..18a7d0c89af 100644 Binary files a/src/main/resources/assets/ae2/textures/block/controller_inside_b.png and b/src/main/resources/assets/ae2/textures/block/controller_inside_b.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_inside_b_powered.png b/src/main/resources/assets/ae2/textures/block/controller_inside_b_powered.png index b57991b630c..2f9e7da2ee1 100644 Binary files a/src/main/resources/assets/ae2/textures/block/controller_inside_b_powered.png and b/src/main/resources/assets/ae2/textures/block/controller_inside_b_powered.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_lights_a.png b/src/main/resources/assets/ae2/textures/block/controller_lights_a.png new file mode 100644 index 00000000000..679b01e0a4a Binary files /dev/null and b/src/main/resources/assets/ae2/textures/block/controller_lights_a.png differ diff --git a/src/main/resources/assets/ae2/textures/block/controller_lights_a.png.mcmeta b/src/main/resources/assets/ae2/textures/block/controller_lights_a.png.mcmeta new file mode 100644 index 00000000000..38a42da1273 --- /dev/null +++ b/src/main/resources/assets/ae2/textures/block/controller_lights_a.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 25 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ae2/textures/block/controller_lights.png b/src/main/resources/assets/ae2/textures/block/controller_lights_b.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/controller_lights.png rename to src/main/resources/assets/ae2/textures/block/controller_lights_b.png diff --git a/src/main/resources/assets/ae2/textures/block/controller_lights_b.png.mcmeta b/src/main/resources/assets/ae2/textures/block/controller_lights_b.png.mcmeta new file mode 100644 index 00000000000..38a42da1273 --- /dev/null +++ b/src/main/resources/assets/ae2/textures/block/controller_lights_b.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 25 + } +} \ No newline at end of file