From 35c538a202daa58a4bcf67725d06ec2334dd8c77 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 28 Sep 2016 01:16:15 +0200 Subject: [PATCH] constructor / destructor connectivity --- .../refinedstorage/block/BlockConstructor.java | 1 - .../refinedstorage/block/BlockDestructor.java | 1 - .../refinedstorage/block/BlockDetector.java | 2 +- .../gui/sidebutton/SideButtonDetectorMode.java | 2 +- .../blockstates/constructor.json | 9 ++++++--- .../refinedstorage/blockstates/destructor.json | 9 ++++++--- .../refinedstorage/blockstates/exporter.json | 4 ++-- .../blockstates/external_storage.json | 4 ++-- .../refinedstorage/blockstates/importer.json | 4 ++-- .../textures/blocks/cable_new.png | Bin 1212 -> 308 bytes .../blocks/constructor_disconnected.png | Bin 0 -> 16573 bytes .../blocks/destructor_disconnected.png | Bin 0 -> 16412 bytes 12 files changed, 20 insertions(+), 16 deletions(-) create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png 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 29e835584bd0f4169feed687e41f0879227f8257..19d20839e4b75acea36322fa05bdc22dd01acbd8 100755 GIT binary patch delta 281 zcmV+!0p|X^3A6%`B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)*zP3cvsW0HjGo zK~y+TrIXPO!ypVq*^3WGU<)SUi!U}NJStNQxpCT_bkfN_&VQgd0n}Q@5)UEn_d8Dt-Z7^qP+m^@4ee0-VOG2AgP+(4KxGhlPRTzM+_d*2vaqd>P_LTOF z-YqdvLX6{OndlN@%m^`%XacAS4@hu4FyI9Oye*3fgg^pLr#>(+sHba!G^X?c@wuBgO-3$a00+&i zvMB>ok!+=AXGwlaX-g$#Ati}20NG?)Rs!uwA)9Dwm83S%RO9Bn5F4HaYrdV>canGlcX<5#$*N z6v4*plD_Vvn=2dc_z%Vo%ry4DUt06|vE1ao&c+X-(%9?j+KHd;430HleSqffpV@p+ zKmE@5?5byv>zl{Ee>{BQmBQ~g$}b+8<7TG+I(FoR*Qilywg1aph2wKZoy+4}8= z)7qoxo1cHX7yapc_IPU3OD87=-aX#2Y}K;eqnD06vuEq6xe=<4+8thc*m)FB#s8CB Lwo5zFw)en4v00yq 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 0000000000000000000000000000000000000000..50a325d4560de400be8685cc387b665f72836132 GIT binary patch literal 16573 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 X^5N)-cUD>N?}tOnrC&8Y^qqeJ84V