diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java index 6d44f8e94..07787737a 100755 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -16,7 +16,6 @@ import refinedstorage.tile.TileConstructor; import java.util.ArrayList; import java.util.List; -// @TODO: Constructor connected / disconnected public class BlockConstructor extends BlockCable { public static final AxisAlignedBB HOLDER_NORTH_AABB = createAABB(7, 7, 2, 9, 9, 6); public static final AxisAlignedBB HOLDER_EAST_AABB = createAABB(10, 7, 7, 14, 9, 9); diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java index 485434478..9a90b2df0 100755 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -16,7 +16,6 @@ import refinedstorage.tile.TileDestructor; import java.util.List; -// @TODO: Destructor connected / disconnected public class BlockDestructor extends BlockCable { public BlockDestructor(String name) { super(name); diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 8c2822f16..532ceda5b 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -17,7 +17,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDetector; -// @TODO: Fix detector model connectivity +// @TODO: Fix detector model connectivity (also HITBOX) public class BlockDetector extends BlockNode { private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 4D / 16D, 1.0D); diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java index 6a0472d91..17ecd711f 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -17,7 +17,7 @@ public class SideButtonDetectorMode extends SideButton { @Override protected void drawButtonIcon(int x, int y) { - // @TODO: Detector side icons + // @TODO: Detector sidebutton icons } @Override diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index 84b82727f..1fdf5f515 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable", - "front": "refinedstorage:blocks/constructor_connected", + "all": "refinedstorage:blocks/cable_new", + "particle": "refinedstorage:blocks/cable_new", + "front": "refinedstorage:blocks/constructor_disconnected", "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", @@ -19,6 +19,9 @@ ], "connected": { "true": { + "textures": { + "front": "refinedstorage:blocks/constructor_connected" + } }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index 3528e087c..3f747a799 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable", - "front": "refinedstorage:blocks/destructor_connected", + "all": "refinedstorage:blocks/cable_new", + "particle": "refinedstorage:blocks/cable_new", + "front": "refinedstorage:blocks/destructor_disconnected", "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", @@ -19,6 +19,9 @@ ], "connected": { "true": { + "textures": { + "front": "refinedstorage:blocks/destructor_connected" + } }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json index 8cb54ce29..7e6635729 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable", + "all": "refinedstorage:blocks/cable_new", + "particle": "refinedstorage:blocks/cable_new", "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json index d5499367e..77b5e06b4 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable", + "all": "refinedstorage:blocks/cable_new", + "particle": "refinedstorage:blocks/cable_new", "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index a131e1e27..8f547066c 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable", + "all": "refinedstorage:blocks/cable_new", + "particle": "refinedstorage:blocks/cable_new", "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png index 29e835584..19d20839e 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png and b/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png new file mode 100755 index 000000000..50a325d45 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png new file mode 100755 index 000000000..41a21e509 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png differ