minecraft
/
PhysicalConnectivity
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Add cable texture, update cable & interface models

This commit is contained in:
Shadowfacts 2021-02-15 17:05:17 -05:00
parent 0f7689d73c
commit 249416b8c2
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
20 changed files with 582 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
src/main/resources/assets/phycon/blockstates/cable.json
View File

@ -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 }
}
]
}

129
src/main/resources/assets/phycon/blockstates/network_interface.json
View File

@ -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 }
}
]
}

57
src/main/resources/assets/phycon/models/block/cable_center.json
View File

@ -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"}
}
}
]
}

15
src/main/resources/assets/phycon/models/block/cable_diag_corner.json Normal file
View File

@ -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"}
}
}
]
}

15
src/main/resources/assets/phycon/models/block/cable_diag_corner_cont.json Normal file
View File

@ -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"}
}
}
]
}

15
src/main/resources/assets/phycon/models/block/cable_diag_corner_xz.json Normal file
View File

@ -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"}
}
}
]
}

15
src/main/resources/assets/phycon/models/block/cable_diag_corner_xz_cont.json Normal file
View File

@ -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"}
}
}
]
}

42
src/main/resources/assets/phycon/models/block/cable_side.json
View File

@ -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"}
}
}
]

22
src/main/resources/assets/phycon/models/block/interface_cable_corner.json Normal file
View File

@ -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"}
}
}
]
}

22
src/main/resources/assets/phycon/models/block/interface_cable_corner_2.json Normal file
View File

@ -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"}
}
}
]
}

22
src/main/resources/assets/phycon/models/block/interface_cable_corner_3.json Normal file
View File

@ -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"}
}
}
]
}

19
src/main/resources/assets/phycon/models/block/interface_cable_straight.json Normal file
View File

@ -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"}
}
}
]
}

11
src/main/resources/assets/phycon/models/block/interface_side.json
View File

@ -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" }
}
}
]

20
src/main/resources/assets/phycon/models/item/cable.json Normal file
View File

@ -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"}
}
}
]
}

BIN
src/main/resources/assets/phycon/textures/block/cable_cap_end.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 598 B

BIN
src/main/resources/assets/phycon/textures/block/cable_straight.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 765 B

BIN
src/main/resources/assets/phycon/textures/block/cable_straight_rotated.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 726 B

BIN
src/main/resources/assets/phycon/textures/block/interface_cable_corner_l.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 757 B

BIN
src/main/resources/assets/phycon/textures/block/interface_cable_corner_l_up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 753 B

BIN
src/main/resources/assets/phycon/textures/block/interface_cable_corner_r.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 758 B