Skip to content

Commit

Permalink
rerefix: wn signals
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jeronimo97
Jeronimo97 committed Oct 20, 2024
1 parent 1431a89 commit 3f2c995
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 27 deletions.
36 changes: 24 additions & 12 deletions src/main/resources/assets/opensignals/modeldefinitions/wnsignal.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,45 @@
{
"blockstate":"hasandis(WNTYPE) && with(WNCROSS.WN3)",
"retexture":{
"lamp_1": "lamp_white",
"lamp_3": "lamp_white",
"lamp_5": "lamp_white"
"lamp_1_north": "lamp_white",
"lamp_3_north": "lamp_white",
"lamp_5_north": "lamp_white",
"lamp_1_south": "lamp_white",
"lamp_2_south": "lamp_white",
"lamp_4_south": "lamp_white"
}
},
{
"blockstate":"hasandis(WNTYPE) && with(WNCROSS.WN4)",
"retexture":{
"lamp_1": "lamp_white",
"lamp_2": "lamp_white",
"lamp_4": "lamp_white"
"lamp_1_north": "lamp_white",
"lamp_2_north": "lamp_white",
"lamp_4_north": "lamp_white",
"lamp_1_south": "lamp_white",
"lamp_3_south": "lamp_white",
"lamp_5_south": "lamp_white"
}
},
{
"blockstate":"hasandis(WNTYPE) && with(WNCROSS.WN5)",
"retexture":{
"lamp_1": "lamp_white",
"lamp_3": "lamp_white",
"lamp_4": "lamp_white"
"lamp_1_north": "lamp_white",
"lamp_3_north": "lamp_white",
"lamp_4_north": "lamp_white",
"lamp_1_south": "lamp_white",
"lamp_3_south": "lamp_white",
"lamp_4_south": "lamp_white"
}
},
{
"blockstate":"hasandis(WNTYPE) && with(WNCROSS.WN6)",
"retexture":{
"lamp_1": "lamp_white",
"lamp_2": "lamp_white",
"lamp_5": "lamp_white"
"lamp_1_north": "lamp_white",
"lamp_2_north": "lamp_white",
"lamp_5_north": "lamp_white",
"lamp_1_south": "lamp_white",
"lamp_2_south": "lamp_white",
"lamp_5_south": "lamp_white"
}
},
{
Expand Down
35 changes: 20 additions & 15 deletions src/main/resources/assets/opensignals/models/block/wn/wn3_6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
"0": "opensignals:blocks/default/shield_gray",
"1": "opensignals:blocks/default/shield_black",
"particle": "opensignals:blocks/default/shield_black",
"lamp_1": "opensignals:blocks/lamps/lamp_dark",
"lamp_2": "opensignals:blocks/lamps/lamp_dark",
"lamp_3": "opensignals:blocks/lamps/lamp_dark",
"lamp_4": "opensignals:blocks/lamps/lamp_dark",
"lamp_5": "opensignals:blocks/lamps/lamp_dark"
"lamp_1_north": "opensignals:blocks/lamps/lamp_dark",
"lamp_2_north": "opensignals:blocks/lamps/lamp_dark",
"lamp_3_north": "opensignals:blocks/lamps/lamp_dark",
"lamp_4_north": "opensignals:blocks/lamps/lamp_dark",
"lamp_5_north": "opensignals:blocks/lamps/lamp_dark",
"lamp_1_south": "opensignals:blocks/lamps/lamp_dark",
"lamp_2_south": "opensignals:blocks/lamps/lamp_dark",
"lamp_3_south": "opensignals:blocks/lamps/lamp_dark",
"lamp_4_south": "opensignals:blocks/lamps/lamp_dark",
"lamp_5_south": "opensignals:blocks/lamps/lamp_dark"
},
"elements": [
{
Expand Down Expand Up @@ -258,7 +263,7 @@
"to": [9, 9, 5.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_1"}
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_1_north"}
}
},
{
Expand All @@ -267,7 +272,7 @@
"to": [11, 7, 5.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_3"}
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_3_north"}
}
},
{
Expand All @@ -276,7 +281,7 @@
"to": [7, 7, 5.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_2"}
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_2_north"}
}
},
{
Expand All @@ -285,7 +290,7 @@
"to": [9, 9, 10.1],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_1"}
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_1_south"}
}
},
{
Expand All @@ -294,7 +299,7 @@
"to": [11, 7, 10.1],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_3"}
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_3_south"}
}
},
{
Expand All @@ -303,7 +308,7 @@
"to": [7, 7, 10.1],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_2"}
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_2_south"}
}
},
{
Expand All @@ -312,7 +317,7 @@
"to": [7, 11, 10.1],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_5"}
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_5_south"}
}
},
{
Expand All @@ -321,7 +326,7 @@
"to": [7, 11, 5.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_5"}
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_5_north"}
}
},
{
Expand All @@ -330,7 +335,7 @@
"to": [11, 11, 10.1],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_4"}
"south": {"uv": [1, 1, 3, 3], "texture": "#lamp_4_south"}
}
},
{
Expand All @@ -339,7 +344,7 @@
"to": [11, 11, 5.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_4"}
"north": {"uv": [1, 1, 3, 3], "texture": "#lamp_4_north"}
}
},
{
Expand Down

0 comments on commit 3f2c995

Please sign in to comment.