From 9440d009d8a240467bc2cedfb125b38f820a48f1 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 20 Oct 2024 19:13:07 +0200 Subject: [PATCH] rerefix: wn signals --- .../modeldefinitions/wnsignal.json | 36 ++++++++++++------- .../opensignals/models/block/wn/wn3_6.json | 35 ++++++++++-------- 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/src/main/resources/assets/opensignals/modeldefinitions/wnsignal.json b/src/main/resources/assets/opensignals/modeldefinitions/wnsignal.json index c0fd325e3..658f6e7b5 100644 --- a/src/main/resources/assets/opensignals/modeldefinitions/wnsignal.json +++ b/src/main/resources/assets/opensignals/modeldefinitions/wnsignal.json @@ -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" } }, { diff --git a/src/main/resources/assets/opensignals/models/block/wn/wn3_6.json b/src/main/resources/assets/opensignals/models/block/wn/wn3_6.json index b09095691..2b76f74e4 100644 --- a/src/main/resources/assets/opensignals/models/block/wn/wn3_6.json +++ b/src/main/resources/assets/opensignals/models/block/wn/wn3_6.json @@ -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": [ { @@ -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"} } }, { @@ -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"} } }, { @@ -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"} } }, { @@ -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"} } }, { @@ -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"} } }, { @@ -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"} } }, { @@ -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"} } }, { @@ -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"} } }, { @@ -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"} } }, { @@ -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"} } }, {