From 249416b8c2ff96a0e5d845e6dc2dc99caa1ba881 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 15 Feb 2021 17:05:17 -0500 Subject: [PATCH] Add cable texture, update cable & interface models --- .../assets/phycon/blockstates/cable.json | 219 +++++++++++++++++- .../phycon/blockstates/network_interface.json | 129 ++++++++++- .../phycon/models/block/cable_center.json | 57 +++-- .../models/block/cable_diag_corner.json | 15 ++ .../models/block/cable_diag_corner_cont.json | 15 ++ .../models/block/cable_diag_corner_xz.json | 15 ++ .../block/cable_diag_corner_xz_cont.json | 15 ++ .../phycon/models/block/cable_side.json | 42 +++- .../models/block/interface_cable_corner.json | 22 ++ .../block/interface_cable_corner_2.json | 22 ++ .../block/interface_cable_corner_3.json | 22 ++ .../block/interface_cable_straight.json | 19 ++ .../phycon/models/block/interface_side.json | 11 +- .../assets/phycon/models/item/cable.json | 20 ++ .../phycon/textures/block/cable_cap_end.png | Bin 0 -> 598 bytes .../phycon/textures/block/cable_straight.png | Bin 0 -> 765 bytes .../textures/block/cable_straight_rotated.png | Bin 0 -> 726 bytes .../block/interface_cable_corner_l.png | Bin 0 -> 757 bytes .../block/interface_cable_corner_l_up.png | Bin 0 -> 753 bytes .../block/interface_cable_corner_r.png | Bin 0 -> 758 bytes 20 files changed, 582 insertions(+), 41 deletions(-) create mode 100644 src/main/resources/assets/phycon/models/block/cable_diag_corner.json create mode 100644 src/main/resources/assets/phycon/models/block/cable_diag_corner_cont.json create mode 100644 src/main/resources/assets/phycon/models/block/cable_diag_corner_xz.json create mode 100644 src/main/resources/assets/phycon/models/block/cable_diag_corner_xz_cont.json create mode 100644 src/main/resources/assets/phycon/models/block/interface_cable_corner.json create mode 100644 src/main/resources/assets/phycon/models/block/interface_cable_corner_2.json create mode 100644 src/main/resources/assets/phycon/models/block/interface_cable_corner_3.json create mode 100644 src/main/resources/assets/phycon/models/block/interface_cable_straight.json create mode 100644 src/main/resources/assets/phycon/models/item/cable.json create mode 100644 src/main/resources/assets/phycon/textures/block/cable_cap_end.png create mode 100644 src/main/resources/assets/phycon/textures/block/cable_straight.png create mode 100644 src/main/resources/assets/phycon/textures/block/cable_straight_rotated.png create mode 100644 src/main/resources/assets/phycon/textures/block/interface_cable_corner_l.png create mode 100644 src/main/resources/assets/phycon/textures/block/interface_cable_corner_l_up.png create mode 100644 src/main/resources/assets/phycon/textures/block/interface_cable_corner_r.png diff --git a/src/main/resources/assets/phycon/blockstates/cable.json b/src/main/resources/assets/phycon/blockstates/cable.json index 94c665d..79227b6 100644 --- a/src/main/resources/assets/phycon/blockstates/cable.json +++ b/src/main/resources/assets/phycon/blockstates/cable.json @@ -1,8 +1,5 @@ { "multipart": [ - { - "apply": { "model": "phycon:block/cable_center" } - }, { "when": { "down": "on" }, "apply": { "model": "phycon:block/cable_side" } @@ -26,6 +23,222 @@ { "when": { "east": "on" }, "apply": { "model": "phycon:block/cable_side", "x": 90, "y": 270 } + }, + { + "when": { "down": "off|disabled" }, + "apply": { "model": "phycon:block/cable_center" } + }, + { + "when": { "up": "off|disabled" }, + "apply": { "model": "phycon:block/cable_center", "x": 180 } + }, + { + "when": { "north": "off|disabled" }, + "apply": { "model": "phycon:block/cable_center", "x": 270 } + }, + { + "when": { "south": "off|disabled" }, + "apply": { "model": "phycon:block/cable_center", "x": 90 } + }, + { + "when": { "west": "off|disabled" }, + "apply": { "model": "phycon:block/cable_center", "x": 90, "y": 90 } + }, + { + "when": { "east": "off|disabled" }, + "apply": { "model": "phycon:block/cable_center", "x": 90, "y": 270 } + }, + + { + "when": { + "OR": [ + { "down": "off|disabled", "north": "off|disabled", "up": "off|disabled" }, + { "down": "off|disabled", "north": "off|disabled", "south": "off|disabled" }, + { "down": "off|disabled", "north": "off|disabled", "east": "on" }, + { "down": "off|disabled", "north": "off|disabled", "west": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner" } + }, + { + "when": { "down": "off|disabled", "north": "off|disabled", "up": "on", "south": "on", "east": "off|disabled", "west": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_cont" } + }, + + { + "when": { + "OR": [ + { "down": "off|disabled", "south": "off|disabled", "up": "off|disabled" }, + { "down": "off|disabled", "south": "off|disabled", "north": "off|disabled" }, + { "down": "off|disabled", "south": "off|disabled", "east": "on" }, + { "down": "off|disabled", "south": "off|disabled", "west": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner", "y": 180 } + }, + { + "when": { "down": "off|disabled", "south": "off|disabled", "up": "on", "north": "on", "east": "off|disabled", "west": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_cont", "y": 180 } + }, + + { + "when": { + "OR": [ + { "up": "off|disabled", "north": "off|disabled", "down": "off|disabled" }, + { "up": "off|disabled", "north": "off|disabled", "south": "off|disabled" }, + { "up": "off|disabled", "north": "off|disabled", "east": "on" }, + { "up": "off|disabled", "north": "off|disabled", "west": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner", "x": 180, "y": 180 } + }, + { + "when": { "up": "off|disabled", "north": "off|disabled", "down": "on", "south": "on", "east": "off|disabled", "west": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_cont", "x": 180, "y": 180 } + }, + + { + "when": { + "OR": [ + { "up": "off|disabled", "south": "off|disabled", "down": "off|disabled" }, + { "up": "off|disabled", "south": "off|disabled", "north": "off|disabled" }, + { "up": "off|disabled", "south": "off|disabled", "east": "on" }, + { "up": "off|disabled", "south": "off|disabled", "west": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner", "x": 180 } + }, + { + "when": { "up": "off|disabled", "south": "off|disabled", "down": "on", "north": "on", "east": "off|disabled", "west": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_cont", "x": 180} + }, + + { + "when": { + "OR": [ + { "down": "off|disabled", "west": "off|disabled", "up": "off|disabled" }, + { "down": "off|disabled", "west": "off|disabled", "east": "off|disabled" }, + { "down": "off|disabled", "west": "off|disabled", "north": "on" }, + { "down": "off|disabled", "west": "off|disabled", "south": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner", "y": 270 } + }, + { + "when": { "down": "off|disabled", "west": "off|disabled", "up": "on", "east": "on", "north": "off|disabled", "south": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_cont", "y": 270 } + }, + + { + "when": { + "OR": [ + { "down": "off|disabled", "east": "off|disabled", "up": "off|disabled" }, + { "down": "off|disabled", "east": "off|disabled", "west": "off|disabled" }, + { "down": "off|disabled", "east": "off|disabled", "north": "on" }, + { "down": "off|disabled", "east": "off|disabled", "south": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner", "y": 90 } + }, + { + "when": { "down": "off|disabled", "east": "off|disabled", "up": "on", "west": "on", "north": "off|disabled", "south": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_cont", "y": 90 } + }, + + { + "when": { + "OR": [ + { "up": "off|disabled", "west": "off|disabled", "down": "off|disabled" }, + { "up": "off|disabled", "west": "off|disabled", "east": "off|disabled" }, + { "up": "off|disabled", "west": "off|disabled", "north": "on" }, + { "up": "off|disabled", "west": "off|disabled", "south": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner", "x": 180, "y": 90 } + }, + { + "when": { "up": "off|disabled", "west": "off|disabled", "down": "on", "east": "on", "north": "off|disabled", "south": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_cont", "x": 180, "y": 90 } + }, + + { + "when": { + "OR": [ + { "up": "off|disabled", "east": "off|disabled", "down": "off|disabled" }, + { "up": "off|disabled", "east": "off|disabled", "west": "off|disabled" }, + { "up": "off|disabled", "east": "off|disabled", "north": "on" }, + { "up": "off|disabled", "east": "off|disabled", "south": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner", "x": 180, "y": 270 } + }, + { + "when": { "up": "off|disabled", "east": "off|disabled", "down": "on", "west": "on", "north": "off|disabled", "south": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_cont", "x": 180, "y": 270 } + }, + + { + "when": { + "OR": [ + { "north": "off|disabled", "west": "off|disabled", "south": "off|disabled" }, + { "north": "off|disabled", "west": "off|disabled", "east": "off|disabled" }, + { "north": "off|disabled", "west": "off|disabled", "down": "on" }, + { "north": "off|disabled", "west": "off|disabled", "up": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner_xz" } + }, + { + "when": { "north": "off|disabled", "west": "off|disabled", "south": "on", "east": "on", "down": "off|disabled", "up": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_xz_cont" } + }, + + { + "when": { + "OR": [ + { "north": "off|disabled", "east": "off|disabled", "south": "off|disabled" }, + { "north": "off|disabled", "east": "off|disabled", "west": "off|disabled" }, + { "north": "off|disabled", "east": "off|disabled", "down": "on" }, + { "north": "off|disabled", "east": "off|disabled", "up": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner_xz", "y": 90 } + }, + { + "when": { "north": "off|disabled", "east": "off|disabled", "south": "on", "west": "on", "down": "off|disabled", "up": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_xz_cont", "y": 90 } + }, + + { + "when": { + "OR": [ + { "south": "off|disabled", "east": "off|disabled", "north": "off|disabled" }, + { "south": "off|disabled", "east": "off|disabled", "west": "off|disabled" }, + { "south": "off|disabled", "east": "off|disabled", "down": "on" }, + { "south": "off|disabled", "east": "off|disabled", "up": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner_xz", "y": 180 } + }, + { + "when": { "south": "off|disabled", "east": "off|disabled", "north": "on", "west": "on", "down": "off|disabled", "up": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_xz_cont", "y": 180 } + }, + + { + "when": { + "OR": [ + { "south": "off|disabled", "west": "off|disabled", "north": "off|disabled" }, + { "south": "off|disabled", "west": "off|disabled", "east": "off|disabled" }, + { "south": "off|disabled", "west": "off|disabled", "down": "on" }, + { "south": "off|disabled", "west": "off|disabled", "up": "on" } + ] + }, + "apply": { "model": "phycon:block/cable_diag_corner_xz", "y": 270 } + }, + { + "when": { "south": "off|disabled", "west": "off|disabled", "north": "on", "east": "on", "down": "off|disabled", "up": "off|disabled" }, + "apply": { "model": "phycon:block/cable_diag_corner_xz_cont", "y": 270 } } ] } diff --git a/src/main/resources/assets/phycon/blockstates/network_interface.json b/src/main/resources/assets/phycon/blockstates/network_interface.json index 30b3300..b1166ed 100644 --- a/src/main/resources/assets/phycon/blockstates/network_interface.json +++ b/src/main/resources/assets/phycon/blockstates/network_interface.json @@ -27,29 +27,134 @@ "when": { "facing": "east" }, "apply": { "model": "phycon:block/interface_side", "x": 90, "y": 270 } }, + { - "when": { "cable_connection": "down" }, - "apply": { "model": "phycon:block/cable_side" } + "when": { "cable_connection": "up", "facing": "down" }, + "apply": { "model": "phycon:block/interface_cable_straight" } }, { - "when": { "cable_connection": "up" }, - "apply": { "model": "phycon:block/cable_side", "x": 180 } + "when": { "cable_connection": "down", "facing": "up" }, + "apply": { "model": "phycon:block/interface_cable_straight", "x": 180 } }, { - "when": { "cable_connection": "north" }, - "apply": { "model": "phycon:block/cable_side", "x": 270 } + "when": { "cable_connection": "north", "facing": "south" }, + "apply": { "model": "phycon:block/interface_cable_straight", "x": 90 } }, { - "when": { "cable_connection": "south" }, - "apply": { "model": "phycon:block/cable_side", "x": 90 } + "when": { "cable_connection": "south", "facing": "north" }, + "apply": { "model": "phycon:block/interface_cable_straight", "x": 270 } }, { - "when": { "cable_connection": "west" }, - "apply": { "model": "phycon:block/cable_side", "x": 90, "y": 90 } + "when": { "cable_connection": "west", "facing": "east" }, + "apply": { "model": "phycon:block/interface_cable_straight", "x": 90, "y": 270 } }, { - "when": { "cable_connection": "east" }, - "apply": { "model": "phycon:block/cable_side", "x": 90, "y": 270 } + "when": { "cable_connection": "east", "facing": "west" }, + "apply": { "model": "phycon:block/interface_cable_straight", "x": 90, "y": 90 } + }, + + { + "when": {"cable_connection": "north", "facing": "down"}, + "apply": { "model": "phycon:block/interface_cable_corner" } + }, + { + "when": {"cable_connection": "east", "facing": "down"}, + "apply": { "model": "phycon:block/interface_cable_corner", "y": 90 } + }, + { + "when": {"cable_connection": "south", "facing": "down"}, + "apply": { "model": "phycon:block/interface_cable_corner", "y": 180 } + }, + { + "when": {"cable_connection": "west", "facing": "down"}, + "apply": { "model": "phycon:block/interface_cable_corner", "y": 270 } + }, + + { + "when": {"cable_connection": "north", "facing": "up"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 180, "y": 180 } + }, + { + "when": {"cable_connection": "east", "facing": "up"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 180, "y": 270 } + }, + { + "when": {"cable_connection": "south", "facing": "up"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 180 } + }, + { + "when": {"cable_connection": "west", "facing": "up"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 180, "y": 90 } + }, + + { + "when": {"cable_connection": "down", "facing": "north"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 90, "y": 180 } + }, + { + "when": {"cable_connection": "up", "facing": "north"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 270 } + }, + { + "when": {"cable_connection": "west", "facing": "north"}, + "apply": { "model": "phycon:block/interface_cable_corner_2" } + }, + { + "when": {"cable_connection": "east", "facing": "north"}, + "apply": { "model": "phycon:block/interface_cable_corner_2", "x": 180, "y": 180 } + }, + + { + "when": {"cable_connection": "down", "facing": "south"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 90 } + }, + { + "when": {"cable_connection": "up", "facing": "south"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 270, "y": 180 } + }, + { + "when": {"cable_connection": "west", "facing": "south"}, + "apply": { "model": "phycon:block/interface_cable_corner_3" } + }, + { + "when": {"cable_connection": "east", "facing": "south"}, + "apply": { "model": "phycon:block/interface_cable_corner_3", "x": 180, "y": 180 } + }, + + { + + "when": {"cable_connection": "down", "facing": "west"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 90, "y": 90 } + }, + { + "when": {"cable_connection": "up", "facing": "west"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 270, "y": 270 } + }, + { + "when": {"cable_connection": "north", "facing": "west"}, + "apply": { "model": "phycon:block/interface_cable_corner_3", "y": 90 } + }, + { + "when": {"cable_connection": "south", "facing": "west"}, + "apply": { "model": "phycon:block/interface_cable_corner_3", "x": 180, "y": 270 } + }, + + { + + "when": {"cable_connection": "down", "facing": "east"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 90, "y": 270 } + }, + { + "when": {"cable_connection": "up", "facing": "east"}, + "apply": { "model": "phycon:block/interface_cable_corner", "x": 270, "y": 90 } + }, + { + "when": {"cable_connection": "north", "facing": "east"}, + "apply": { "model": "phycon:block/interface_cable_corner_2", "y": 90 } + }, + { + "when": {"cable_connection": "south", "facing": "east"}, + "apply": { "model": "phycon:block/interface_cable_corner_2", "x": 180, "y": 270 } } ] } diff --git a/src/main/resources/assets/phycon/models/block/cable_center.json b/src/main/resources/assets/phycon/models/block/cable_center.json index df455e7..05ecfd8 100644 --- a/src/main/resources/assets/phycon/models/block/cable_center.json +++ b/src/main/resources/assets/phycon/models/block/cable_center.json @@ -1,17 +1,42 @@ { - "parent": "block/block", - "elements": [ - { - "from": [6, 6, 6], - "to": [10, 10, 10], - "faces": { - "down": { "texture": "phycon:block/cable_center" }, - "up": { "texture": "phycon:block/cable_center" }, - "north": { "texture": "phycon:block/cable_center" }, - "south": { "texture": "phycon:block/cable_center" }, - "west": { "texture": "phycon:block/cable_center" }, - "east": { "texture": "phycon:block/cable_center" } - } - } - ] -} + "textures": { + "center": "phycon:block/cable_cap_end" + }, + "elements": [ + { + "from": [7, 6, 7], + "to": [9, 7, 9], + "faces": { + "down": {"texture": "#center"} + } + }, + { + "from": [6, 6, 6], + "to": [7, 7, 7], + "faces": { + "down": {"texture": "#center"} + } + }, + { + "from": [6, 6, 9], + "to": [7, 7, 10], + "faces": { + "down": {"texture": "#center"} + } + }, + { + "from": [9, 6, 9], + "to": [10, 7, 10], + "faces": { + "down": {"texture": "#center"} + } + }, + { + "from": [9, 6, 6], + "to": [10, 7, 7], + "faces": { + "down": {"texture": "#center"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/cable_diag_corner.json b/src/main/resources/assets/phycon/models/block/cable_diag_corner.json new file mode 100644 index 0000000..26a0b18 --- /dev/null +++ b/src/main/resources/assets/phycon/models/block/cable_diag_corner.json @@ -0,0 +1,15 @@ +{ + "textures": { + "corner": "phycon:block/cable_cap_end" + }, + "elements": [ + { + "from": [7, 6, 6], + "to": [9, 7, 7], + "faces": { + "down": {"texture": "#corner"}, + "north": {"texture": "#corner"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/cable_diag_corner_cont.json b/src/main/resources/assets/phycon/models/block/cable_diag_corner_cont.json new file mode 100644 index 0000000..1a39d22 --- /dev/null +++ b/src/main/resources/assets/phycon/models/block/cable_diag_corner_cont.json @@ -0,0 +1,15 @@ +{ + "textures": { + "corner": "phycon:block/cable_straight" + }, + "elements": [ + { + "from": [7, 6, 6], + "to": [9, 7, 7], + "faces": { + "down": {"texture": "#corner"}, + "north": {"texture": "#corner"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/cable_diag_corner_xz.json b/src/main/resources/assets/phycon/models/block/cable_diag_corner_xz.json new file mode 100644 index 0000000..36c0c7a --- /dev/null +++ b/src/main/resources/assets/phycon/models/block/cable_diag_corner_xz.json @@ -0,0 +1,15 @@ +{ + "textures": { + "corner": "phycon:block/cable_cap_end" + }, + "elements": [ + { + "from": [6, 7, 6], + "to": [7, 9, 7], + "faces": { + "north": {"texture": "#corner"}, + "west": {"texture": "#corner"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/cable_diag_corner_xz_cont.json b/src/main/resources/assets/phycon/models/block/cable_diag_corner_xz_cont.json new file mode 100644 index 0000000..22833ed --- /dev/null +++ b/src/main/resources/assets/phycon/models/block/cable_diag_corner_xz_cont.json @@ -0,0 +1,15 @@ +{ + "textures": { + "corner": "phycon:block/cable_straight_rotated" + }, + "elements": [ + { + "from": [6, 7, 6], + "to": [7, 9, 7], + "faces": { + "north": {"texture": "#corner"}, + "west": {"texture": "#corner"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/cable_side.json b/src/main/resources/assets/phycon/models/block/cable_side.json index afd43ca..aa0d460 100644 --- a/src/main/resources/assets/phycon/models/block/cable_side.json +++ b/src/main/resources/assets/phycon/models/block/cable_side.json @@ -1,16 +1,46 @@ { "parent": "block/block", + "textures": { + "side": "phycon:block/cable_straight", + "particle": "#side" + }, "elements": [ { "from": [6, 0, 6], "to": [10, 6, 10], "faces": { - "down": { "texture": "phycon:block/cable_side" }, - "up": { "texture": "phycon:block/cable_side" }, - "north": { "texture": "phycon:block/cable_side" }, - "south": { "texture": "phycon:block/cable_side" }, - "west": { "texture": "phycon:block/cable_side" }, - "east": { "texture": "phycon:block/cable_side" } + "north": { "texture": "#side" }, + "south": { "texture": "#side" }, + "west": { "texture": "#side" }, + "east": { "texture": "#side" } + } + }, + { + "from": [7, 6, 6], + "to": [9, 7, 7], + "faces": { + "north": {"texture": "#side"} + } + }, + { + "from": [7, 6, 9], + "to": [9, 7, 10], + "faces": { + "south": {"texture": "#side"} + } + }, + { + "from": [6, 6, 7], + "to": [7, 7, 9], + "faces": { + "west": {"texture": "#side"} + } + }, + { + "from": [9, 6, 7], + "to": [10, 7, 9], + "faces": { + "east": {"texture": "#side"} } } ] diff --git a/src/main/resources/assets/phycon/models/block/interface_cable_corner.json b/src/main/resources/assets/phycon/models/block/interface_cable_corner.json new file mode 100644 index 0000000..e143872 --- /dev/null +++ b/src/main/resources/assets/phycon/models/block/interface_cable_corner.json @@ -0,0 +1,22 @@ +{ + "textures": { + "straight": "phycon:block/cable_straight", + "cap": "phycon:block/cable_cap_end", + "corner_r": "phycon:block/interface_cable_corner_r", + "corner_l": "phycon:block/interface_cable_corner_l" + }, + "elements": [ + { + "from": [6, 6, 0], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#straight"}, + "up": {"texture": "#straight"}, + "north": {"texture": "#cap", "cullface": "north"}, + "south": {"texture": "#straight"}, + "west": {"texture": "#corner_r"}, + "east": {"texture": "#corner_l"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/interface_cable_corner_2.json b/src/main/resources/assets/phycon/models/block/interface_cable_corner_2.json new file mode 100644 index 0000000..e543990 --- /dev/null +++ b/src/main/resources/assets/phycon/models/block/interface_cable_corner_2.json @@ -0,0 +1,22 @@ +{ + "textures": { + "straight": "phycon:block/cable_straight_rotated", + "cap": "phycon:block/cable_cap_end", + "corner_up": "phycon:block/interface_cable_corner_l_up", + "corner_down": "phycon:block/interface_cable_corner_r" + }, + "elements": [ + { + "from": [0, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#corner_down"}, + "up": {"texture": "#corner_up"}, + "north": {"texture": "#straight"}, + "south": {"texture": "#straight"}, + "west": {"texture": "#cap", "cullface": "west"}, + "east": {"texture": "#straight"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/interface_cable_corner_3.json b/src/main/resources/assets/phycon/models/block/interface_cable_corner_3.json new file mode 100644 index 0000000..2dc43b1 --- /dev/null +++ b/src/main/resources/assets/phycon/models/block/interface_cable_corner_3.json @@ -0,0 +1,22 @@ +{ + "textures": { + "straight": "phycon:block/cable_straight_rotated", + "cap": "phycon:block/cable_cap_end", + "corner_down": "phycon:block/interface_cable_corner_l_up", + "corner_up": "phycon:block/interface_cable_corner_r" + }, + "elements": [ + { + "from": [0, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#corner_down"}, + "up": {"texture": "#corner_up"}, + "north": {"texture": "#straight"}, + "south": {"texture": "#straight"}, + "west": {"texture": "#cap", "cullface": "west"}, + "east": {"texture": "#straight"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/interface_cable_straight.json b/src/main/resources/assets/phycon/models/block/interface_cable_straight.json new file mode 100644 index 0000000..36f53b3 --- /dev/null +++ b/src/main/resources/assets/phycon/models/block/interface_cable_straight.json @@ -0,0 +1,19 @@ +{ + "textures": { + "cable": "phycon:block/cable_straight", + "cap": "phycon:block/cable_cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 16, 10], + "faces": { + "up": {"texture": "#cap", "cullface": "up"}, + "north": {"texture": "#cable"}, + "south": {"texture": "#cable"}, + "west": {"texture": "#cable"}, + "east": {"texture": "#cable"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/models/block/interface_side.json b/src/main/resources/assets/phycon/models/block/interface_side.json index 8aec4f8..3adc96d 100644 --- a/src/main/resources/assets/phycon/models/block/interface_side.json +++ b/src/main/resources/assets/phycon/models/block/interface_side.json @@ -1,5 +1,8 @@ { "parent": "block/block", + "textures": { + "cable": "phycon:block/cable_straight" + }, "elements": [ { "from": [2, 0, 2], @@ -17,10 +20,10 @@ "from": [6, 2, 6], "to": [10, 6, 10], "faces": { - "north": { "texture": "phycon:block/cable_side" }, - "south": { "texture": "phycon:block/cable_side" }, - "west": { "texture": "phycon:block/cable_side" }, - "east": { "texture": "phycon:block/cable_side" } + "north": { "texture": "#cable" }, + "south": { "texture": "#cable" }, + "west": { "texture": "#cable" }, + "east": { "texture": "#cable" } } } ] diff --git a/src/main/resources/assets/phycon/models/item/cable.json b/src/main/resources/assets/phycon/models/item/cable.json new file mode 100644 index 0000000..d996f2a --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable_cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/phycon/textures/block/cable_cap_end.png b/src/main/resources/assets/phycon/textures/block/cable_cap_end.png new file mode 100644 index 0000000000000000000000000000000000000000..54c0fc0449562611592cedb7caad9cbe67887f05 GIT binary patch literal 598 zcmV-c0;&CpP)EX>4Tx04R}tkv&MmKpe$iQ$>;b0d^2^$WR@`f~bh2R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwH#a9m7b)?7NufoI2gm(*ckglc4iIW3rde&{fTr7K zG9DAtnN_jl6#{zD2N9z(vy3@OO2Bt~-6O!)yC~1{KlkV8RN#J&iAq7)K7rmGjOFh{pA`k^GSNO zsYQ-}-fiIGx~VC9z~v4w@MOrQ>`FnJLM{iqpV2pEfc{&cYt8Gev5(USAVpmzZh(VB zU?fl3>pt)9Z0+seGmZX!0Ch}qsEh=&3;+NC32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rg0uK@a4?g%fX#fBKWJyFpR5;7+k--f>KomsZ-|s{msX#XhP@@KvLjexLN@Npj zHDC`;9QIvj@-oRl;(H_()ZGvqu&Pq|leupnyID-I8$**9TqvVmq6?w|<2@<@1VrS$ kpj2hD8wcRTq_cm`4YDH?&2^A$!TEX>4Tx04R}tkv&MmKpe$iQ$>;b0d^2^$WR@`f~bh2R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwH#a9m7b)?7NufoI2gm(*ckglc4iIW3rde&{fTr7K zG9DAtnN_jl6#{zD2N9z(vy3@OO2Bt~-6O!)yC~1{KlkV8RN#J&iAq7)K7rmGjOFh{pA`k^GSNO zsYQ-}-fiIGx~VC9z~v4w@MOrQ>`FnJLM{iqpV2pEfc{&cYt8Gev5(USAVpmzZh(VB zU?fl3>pt)9Z0+seGmZX!0Ch}qsEh=&3;+NC32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rg0uK=wI3ELwCjbBe3rR#lR5;6(lR-`cF%Sf+$6h50Nu)%|fiLj^-pC9140kRl z0s@3(*V9~bW05vD}f7UdNHG1PX-d zF=j=7+>K;YM#`UD1VS vnH3@prBtedF+Cr!Kr|pEWEdp$&o=%744`;N>+Ak?00000NkvXXu0mjfr%p>8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/phycon/textures/block/cable_straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable_straight_rotated.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f3dd5c80eb823ee3252d4aecef28ad6887e839 GIT binary patch literal 726 zcmV;{0xA88P)EX>4Tx04R}tkv&MmKpe$iQ$>;b0d^2^$WR@`f~bh2R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwH#a9m7b)?7NufoI2gm(*ckglc4iIW3rde&{fTr7K zG9DAtnN_jl6#{zD2N9z(vy3@OO2Bt~-6O!)yC~1{KlkV8RN#J&iAq7)K7rmGjOFh{pA`k^GSNO zsYQ-}-fiIGx~VC9z~v4w@MOrQ>`FnJLM{iqpV2pEfc{&cYt8Gev5(USAVpmzZh(VB zU?fl3>pt)9Z0+seGmZX!0Ch}qsEh=&3;+NC32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rg0uL1u6HZw(F#rGn15dz&3B*bPE;iAaT^wz$ zBZx%=qc;L$L;`y?ppe8_;)H1YM6!}O6WL@Y{q^w9WHY-M5>n6*TbsSaTH*@xmdQXU zM0fF328ljw`FD;S%r1m!HY07*qo IM6N<$g7suIS^xk5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/phycon/textures/block/interface_cable_corner_l.png b/src/main/resources/assets/phycon/textures/block/interface_cable_corner_l.png new file mode 100644 index 0000000000000000000000000000000000000000..baa1fcbecb11c67e27a760b0c790f67d864d8f09 GIT binary patch literal 757 zcmVEX>4Tx04R}tkv&MmKpe$iQ$>;b0d^2^$WR@`f~bh2R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwH#a9m7b)?7NufoI2gm(*ckglc4iIW3rde&{fTr7K zG9DAtnN_jl6#{zD2N9z(vy3@OO2Bt~-6O!)yC~1{KlkV8RN#J&iAq7)K7rmGjOFh{pA`k^GSNO zsYQ-}-fiIGx~VC9z~v4w@MOrQ>`FnJLM{iqpV2pEfc{&cYt8Gev5(USAVpmzZh(VB zU?fl3>pt)9Z0+seGmZX!0Ch}qsEh=&3;+NC32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rg0uL1>FYz(&f&c&k14%?dR5;7+(m^f+Q4~hu^WXc5F1m$?5Ca=vKbC4ECWZz& zF`-+RqP%+d8dw5D-wsZ4;NP!_+dIyRGq=iX!qPg1`pK~uJc6+}A1yc~801WHE~7Dd zQnOGN+1S*in6WSD=gI)QXJ!-ZM{+K)p|EGhir`g1Z7hmWu9hc=K!OG0W!!Odc*4VO z%k^>vW^{5cb0#7&Grl4SHx!BW4y$etPcfNT$4^EX>4Tx04R}tkv&MmKpe$iQ$>;b0d^2^$WR@`f~bh2R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwH#a9m7b)?7NufoI2gm(*ckglc4iIW3rde&{fTr7K zG9DAtnN_jl6#{zD2N9z(vy3@OO2Bt~-6O!)yC~1{KlkV8RN#J&iAq7)K7rmGjOFh{pA`k^GSNO zsYQ-}-fiIGx~VC9z~v4w@MOrQ>`FnJLM{iqpV2pEfc{&cYt8Gev5(USAVpmzZh(VB zU?fl3>pt)9Z0+seGmZX!0Ch}qsEh=&3;+NC32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rg0uL238lnNOHvj+t|4BqaR5;7+(#uW5Ko~{gbAOLxu#riK5U&MgQ7N4uQ36B+ z2_+CGv1cv|N`NKb<}`5N->+%;@W{IXL9c`i8)fc_*;QbRlSpg`x^d4y&^oh9Ga5_) zz5t&i56+%ByHog8_^$1Je}3Vu?W?Zk4U=T{b>hY&y+m5}b8Kh~C16%y5+qEv*o`BR zCt8at64!lCWOG{AjAbH{A%!re;it7AqJ|KS#GnAoZ9r2@mf4O+h79TDbHjcbp-OZi z4g|+im}54;!G#L(^s(kr70+K=0+@=aC`2aI)|D1UYln^{>&%l@wg_oq)JXyuQq94I j6AJS>u~+rK;a~U$bZdOSK?ioW00000NkvXXu0mjfUfxH1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/phycon/textures/block/interface_cable_corner_r.png b/src/main/resources/assets/phycon/textures/block/interface_cable_corner_r.png new file mode 100644 index 0000000000000000000000000000000000000000..e1e9ae916a059241b1b83841cfa900b4b491d18d GIT binary patch literal 758 zcmVEX>4Tx04R}tkv&MmKpe$iQ$>;b0d^2^$WR@`f~bh2R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwH#a9m7b)?7NufoI2gm(*ckglc4iIW3rde&{fTr7K zG9DAtnN_jl6#{zD2N9z(vy3@OO2Bt~-6O!)yC~1{KlkV8RN#J&iAq7)K7rmGjOFh{pA`k^GSNO zsYQ-}-fiIGx~VC9z~v4w@MOrQ>`FnJLM{iqpV2pEfc{&cYt8Gev5(USAVpmzZh(VB zU?fl3>pt)9Z0+seGmZX!0Ch}qsEh=&3;+NC32;bRa{vG?BLDy{BLR4&KXw2B00(qQ zO+^Rg0uL1<5D^V!IRF3w1W80eR5;7+&`nMPK@dRUSJgehOa=mpKQWxZ!~=O%Z{h_+ zjX_~#2FC8La={VU@@?M!!PUiN@%%z1nQ0L=8kl;a^}-gV4oZ^?MU`F2wAGA*B~}74 zRD9(^444n8FoejB7^4IZCfwt6=KKf*cL1q#A_e6H