diff --git a/src/main/java/com/troblecodings/signals/animation/ModelTranslation.java b/src/main/java/com/troblecodings/signals/animation/ModelTranslation.java index 815181999..6634a34e0 100644 --- a/src/main/java/com/troblecodings/signals/animation/ModelTranslation.java +++ b/src/main/java/com/troblecodings/signals/animation/ModelTranslation.java @@ -25,20 +25,17 @@ public ModelTranslation(final VectorWrapper translation) { } public void translate(final RenderAnimationInfo info) { - if (!modelTranslation.equals(VectorWrapper.ZERO)) { - info.stack.translate(modelTranslation.getX(), modelTranslation.getY(), - modelTranslation.getZ()); // Modell verschieben - } + info.stack.translate(modelTranslation.getX() - 0.5f, modelTranslation.getY() - 0.5f, + modelTranslation.getZ() - 0.5f); // Modell verschieben + if (!quaternion.equals(Quaternion.ONE)) { info.stack.mulPose(quaternion); } if (!translation.equals(VectorWrapper.ZERO)) { info.stack.translate(translation.getX(), translation.getY(), translation.getZ()); } - if (!pivotTranslation.equals(VectorWrapper.ZERO)) { - info.stack.translate(pivotTranslation.getX(), pivotTranslation.getY(), - pivotTranslation.getZ()); // Pivot Punkt - } + info.stack.translate(pivotTranslation.getX(), pivotTranslation.getY(), + pivotTranslation.getZ()); // Pivot Punkt } public Quaternion getQuaternion() { diff --git a/src/main/resources/assets/opensignals/animations/railroadgate.json b/src/main/resources/assets/opensignals/animations/railroadgate.json new file mode 100644 index 000000000..b427df0a1 --- /dev/null +++ b/src/main/resources/assets/opensignals/animations/railroadgate.json @@ -0,0 +1,204 @@ +{ + "animations": { + "railroad_gate/barrier_base_top": { + "translationX": 0.5, + "translationY": 1.1875, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(BARRIER_OPEN.FALSE)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": -0.5, + "pivotY": -0.1875, + "pivotZ": 0 + }, + { + "predicate": "config(BARRIER_OPEN.TRUE)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 90, + "pivotX": -0.5, + "pivotY": -0.1875, + "pivotZ": 0 + } + ] + }, + "railroad_gate/barrier_1": { + "translationX": 0.5, + "translationY": 1.1875, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(BARRIER_OPEN.FALSE)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": 0.5, + "pivotY": -0.1875, + "pivotZ": 0 + }, + { + "predicate": "config(BARRIER_OPEN.TRUE)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 90, + "pivotX": 0.5, + "pivotY": -0.1875, + "pivotZ": 0 + } + ] + }, + "railroad_gate/barrier_2": { + "translationX": 0.5, + "translationY": 1.1875, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(BARRIER_OPEN.FALSE) && (config(BARRIER_LENGTH.L1) || config(BARRIER_LENGTH.L2) || config(BARRIER_LENGTH.L3) || config(BARRIER_LENGTH.L4) || config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": 1.5, + "pivotY": -0.1875, + "pivotZ": 0 + }, + { + "predicate": "config(BARRIER_OPEN.TRUE) && (config(BARRIER_LENGTH.L1) || config(BARRIER_LENGTH.L2) || config(BARRIER_LENGTH.L3) || config(BARRIER_LENGTH.L4) || config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 90, + "pivotX": 1.5, + "pivotY": -0.1875, + "pivotZ": 0 + } + ] + }, + "railroad_gate/barrier_3": { + "translationX": 0.5, + "translationY": 1.1875, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(BARRIER_OPEN.FALSE) && (config(BARRIER_LENGTH.L2) || config(BARRIER_LENGTH.L3) || config(BARRIER_LENGTH.L4) || config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": 2.5, + "pivotY": -0.1875, + "pivotZ": 0 + }, + { + "predicate": "config(BARRIER_OPEN.TRUE) && (config(BARRIER_LENGTH.L2) || config(BARRIER_LENGTH.L3) || config(BARRIER_LENGTH.L4) || config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 90, + "pivotX": 2.5, + "pivotY": -0.1875, + "pivotZ": 0 + } + ] + }, + "railroad_gate/barrier_4": { + "translationX": 0.5, + "translationY": 1.1875, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(BARRIER_OPEN.FALSE) && (config(BARRIER_LENGTH.L3) || config(BARRIER_LENGTH.L4) || config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": 3.5, + "pivotY": -0.1875, + "pivotZ": 0 + }, + { + "predicate": "config(BARRIER_OPEN.TRUE) && (config(BARRIER_LENGTH.L3) || config(BARRIER_LENGTH.L4) || config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 90, + "pivotX": 3.5, + "pivotY": -0.1875, + "pivotZ": 0 + } + ] + }, + "railroad_gate/barrier_5": { + "translationX": 0.5, + "translationY": 1.1875, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(BARRIER_OPEN.FALSE) && (config(BARRIER_LENGTH.L4) || config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": 4.5, + "pivotY": -0.1875, + "pivotZ": 0 + }, + { + "predicate": "config(BARRIER_OPEN.TRUE) && (config(BARRIER_LENGTH.L4) || config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 90, + "pivotX": 4.5, + "pivotY": -0.1875, + "pivotZ": 0 + } + ] + }, + "railroad_gate/barrier_6": { + "translationX": 0.5, + "translationY": 1.1875, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(BARRIER_OPEN.FALSE) && (config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": 5.5, + "pivotY": -0.1875, + "pivotZ": 0 + }, + { + "predicate": "config(BARRIER_OPEN.TRUE) && (config(BARRIER_LENGTH.L5) || config(BARRIER_LENGTH.L6))", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 90, + "pivotX": 5.5, + "pivotY": -0.1875, + "pivotZ": 0 + } + ] + }, + "railroad_gate/barrier_7": { + "translationX": 0.5, + "translationY": 1.1875, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(BARRIER_OPEN.FALSE) && config(BARRIER_LENGTH.L6)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": 6.5, + "pivotY": -0.1875, + "pivotZ": 0 + }, + { + "predicate": "config(BARRIER_OPEN.TRUE) && config(BARRIER_LENGTH.L6)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 90, + "pivotX": 6.5, + "pivotY": -0.1875, + "pivotZ": 0 + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/animations/railroadgateanimated.json b/src/main/resources/assets/opensignals/animations/railroadgateanimated.json deleted file mode 100644 index c8de0b926..000000000 --- a/src/main/resources/assets/opensignals/animations/railroadgateanimated.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "animations": { - "railroad_gate/barrier_base_top": { - "translationX": 0, - "translationY": 0, - "translationZ": 0, - "animationConfigs": [ - { - "predicate": "config(BARRIER_OPEN.FALSE)", - "mode": "ROTATION", - "rotationAxis": "Z", - "rotation": 0, - "pivotX": 0, - "pivotY": 0, - "pivotZ": 0 - }, - { - "predicate": "config(BARRIER_OPEN.TRUE)", - "mode": "ROTATION", - "rotationAxis": "Z", - "rotation": 90, - "pivotX": 0, - "pivotY": 0, - "pivotZ": 0 - } - ] - }, - "railroad_gate/barrier_1": { - "translationX": 0, - "translationY": 0, - "translationZ": 0, - "animationConfigs": [ - { - "predicate": "config(BARRIER_OPEN.FALSE)", - "mode": "ROTATION", - "rotationAxis": "Z", - "rotation": 0, - "pivotX": 0, - "pivotY": 0, - "pivotZ": 0 - }, - { - "predicate": "config(BARRIER_OPEN.TRUE)", - "mode": "ROTATION", - "rotationAxis": "Z", - "rotation": 90, - "pivotX": 0, - "pivotY": 0, - "pivotZ": 0 - } - ] - }, - "railroad_gate/barrier_2": { - "translationX": 0, - "translationY": 0, - "translationZ": 0, - "animationConfigs": [ - { - "predicate": "config(BARRIER_OPEN.FALSE)", - "mode": "ROTATION", - "rotationAxis": "Z", - "rotation": 0, - "pivotX": 0, - "pivotY": 0, - "pivotZ": 0 - }, - { - "predicate": "config(BARRIER_OPEN.TRUE)", - "mode": "ROTATION", - "rotationAxis": "Z", - "rotation": 90, - "pivotX": 0, - "pivotY": 0, - "pivotZ": 0 - } - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/animations/semaphoresignal.json b/src/main/resources/assets/opensignals/animations/semaphoresignal.json index 49c3c8bc7..0ee496480 100644 --- a/src/main/resources/assets/opensignals/animations/semaphoresignal.json +++ b/src/main/resources/assets/opensignals/animations/semaphoresignal.json @@ -1,49 +1,101 @@ { "animations": { "semaphore_signals/sema_main_wing1": { - "translationX": 0.15, - "translationY": 6.95, - "translationZ": -0.5, - + "translationX": 0.6875, + "translationY": 7.5625, + "translationZ": 0, "animationConfigs": [ { - "predicate": "config(WING1.FALSE)", + "predicate": "config(WING1.FALSE) && config(SEMATYPE.MAIN)", "mode": "ROTATION", "rotationAxis": "Z", "rotation": 0, - "pivotX": -0.65, - "pivotY": -4.45, + "pivotX": -0.6875, + "pivotY": -0.5625, "pivotZ": 0 }, { - "predicate": "config(WING1.TRUE)", + "predicate": "config(WING1.TRUE) && config(SEMATYPE.MAIN)", "mode": "ROTATION", "rotationAxis": "Z", "rotation": -45, - "pivotX": -0.65, - "pivotY": -4.45, + "pivotX": -0.6875, + "pivotY": -0.5625, "pivotZ": 0 } ] }, "semaphore_signals/sema_main_wing2": { + "translationX": 0.6875, + "translationY": 5.5625, + "translationZ": 0, "animationConfigs": [ { - "predicate": "config(WING2.FALSE)", + "predicate": "config(WING2.FALSE) && config(SEMATYPE.MAIN)", "mode": "ROTATION", "rotationAxis": "Z", "rotation": 0, - "pivotX": 0, - "pivotY": 0, + "pivotX": -0.6875, + "pivotY": -0.5625, "pivotZ": 0 }, { - "predicate": "config(WING2.TRUE)", + "predicate": "config(WING2.TRUE) && config(SEMATYPE.MAIN)", "mode": "ROTATION", "rotationAxis": "Z", "rotation": 45, - "pivotX": 0, - "pivotY": 0, + "pivotX": -0.6875, + "pivotY": -0.5625, + "pivotZ": 0 + } + ] + }, + "semaphore_signals/sema_main_wing1_small": { + "translationX": 0.6875, + "translationY": 4.5625, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(WING1.FALSE) && config(SEMATYPE.MAIN_SMALL)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": -0.6875, + "pivotY": -0.5625, + "pivotZ": 0 + }, + { + "predicate": "config(WING1.TRUE) && config(SEMATYPE.MAIN_SMALL)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": -45, + "pivotX": -0.6875, + "pivotY": -0.5625, + "pivotZ": 0 + } + ] + }, + "semaphore_signals/sema_main_wing2_small": { + "translationX": 0.6875, + "translationY": 2.5625, + "translationZ": 0, + "animationConfigs": [ + { + "predicate": "config(WING2.FALSE) && config(SEMATYPE.MAIN_SMALL)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 0, + "pivotX": -0.6875, + "pivotY": -0.5625, + "pivotZ": 0 + }, + { + "predicate": "config(WING2.TRUE) && config(SEMATYPE.MAIN_SMALL)", + "mode": "ROTATION", + "rotationAxis": "Z", + "rotation": 45, + "pivotX": -0.6875, + "pivotY": -0.5625, "pivotZ": 0 } ] diff --git a/src/main/resources/assets/opensignals/modeldefinitions/railroadgateanimated.json b/src/main/resources/assets/opensignals/modeldefinitions/railroadgateanimated.json deleted file mode 100644 index 4e500cffb..000000000 --- a/src/main/resources/assets/opensignals/modeldefinitions/railroadgateanimated.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "textures": {}, - "models": { - "railroad_gate/barrier_base": { - "textures": [ - {} - ], - "y": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_3.json b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_3.json new file mode 100644 index 000000000..d1686e055 --- /dev/null +++ b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_3.json @@ -0,0 +1 @@ +{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "opensignals:blocks/railroad_gate/white_red", "particle": "opensignals:blocks/railroad_gate/white_red"}, "elements": [{"from": [0, 1, 7], "to": [16, 5, 9], "faces": {"north": {"uv": [16, 0, 0, 4], "texture": "#0"}, "east": {"uv": [14, 0, 16, 4], "texture": "#0"}, "south": {"uv": [0, 0, 16, 4], "texture": "#0"}, "up": {"uv": [0, 0, 16, 2], "texture": "#0"}, "down": {"uv": [0, 0, 16, 2], "texture": "#0"}}}, {"from": [0, 2, 6], "to": [16, 4, 7], "faces": {"north": {"uv": [16, 0, 0, 2], "texture": "#0"}, "east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}, {"from": [0, 2, 9], "to": [16, 4, 10], "faces": {"east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "south": {"uv": [0, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_4.json b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_4.json new file mode 100644 index 000000000..d1686e055 --- /dev/null +++ b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_4.json @@ -0,0 +1 @@ +{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "opensignals:blocks/railroad_gate/white_red", "particle": "opensignals:blocks/railroad_gate/white_red"}, "elements": [{"from": [0, 1, 7], "to": [16, 5, 9], "faces": {"north": {"uv": [16, 0, 0, 4], "texture": "#0"}, "east": {"uv": [14, 0, 16, 4], "texture": "#0"}, "south": {"uv": [0, 0, 16, 4], "texture": "#0"}, "up": {"uv": [0, 0, 16, 2], "texture": "#0"}, "down": {"uv": [0, 0, 16, 2], "texture": "#0"}}}, {"from": [0, 2, 6], "to": [16, 4, 7], "faces": {"north": {"uv": [16, 0, 0, 2], "texture": "#0"}, "east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}, {"from": [0, 2, 9], "to": [16, 4, 10], "faces": {"east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "south": {"uv": [0, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_5.json b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_5.json new file mode 100644 index 000000000..d1686e055 --- /dev/null +++ b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_5.json @@ -0,0 +1 @@ +{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "opensignals:blocks/railroad_gate/white_red", "particle": "opensignals:blocks/railroad_gate/white_red"}, "elements": [{"from": [0, 1, 7], "to": [16, 5, 9], "faces": {"north": {"uv": [16, 0, 0, 4], "texture": "#0"}, "east": {"uv": [14, 0, 16, 4], "texture": "#0"}, "south": {"uv": [0, 0, 16, 4], "texture": "#0"}, "up": {"uv": [0, 0, 16, 2], "texture": "#0"}, "down": {"uv": [0, 0, 16, 2], "texture": "#0"}}}, {"from": [0, 2, 6], "to": [16, 4, 7], "faces": {"north": {"uv": [16, 0, 0, 2], "texture": "#0"}, "east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}, {"from": [0, 2, 9], "to": [16, 4, 10], "faces": {"east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "south": {"uv": [0, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_6.json b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_6.json new file mode 100644 index 000000000..d1686e055 --- /dev/null +++ b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_6.json @@ -0,0 +1 @@ +{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "opensignals:blocks/railroad_gate/white_red", "particle": "opensignals:blocks/railroad_gate/white_red"}, "elements": [{"from": [0, 1, 7], "to": [16, 5, 9], "faces": {"north": {"uv": [16, 0, 0, 4], "texture": "#0"}, "east": {"uv": [14, 0, 16, 4], "texture": "#0"}, "south": {"uv": [0, 0, 16, 4], "texture": "#0"}, "up": {"uv": [0, 0, 16, 2], "texture": "#0"}, "down": {"uv": [0, 0, 16, 2], "texture": "#0"}}}, {"from": [0, 2, 6], "to": [16, 4, 7], "faces": {"north": {"uv": [16, 0, 0, 2], "texture": "#0"}, "east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}, {"from": [0, 2, 9], "to": [16, 4, 10], "faces": {"east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "south": {"uv": [0, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_7.json b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_7.json new file mode 100644 index 000000000..d1686e055 --- /dev/null +++ b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_7.json @@ -0,0 +1 @@ +{"credit": "Made with Blockbench by Mc_Jeronimo", "textures": {"0": "opensignals:blocks/railroad_gate/white_red", "particle": "opensignals:blocks/railroad_gate/white_red"}, "elements": [{"from": [0, 1, 7], "to": [16, 5, 9], "faces": {"north": {"uv": [16, 0, 0, 4], "texture": "#0"}, "east": {"uv": [14, 0, 16, 4], "texture": "#0"}, "south": {"uv": [0, 0, 16, 4], "texture": "#0"}, "up": {"uv": [0, 0, 16, 2], "texture": "#0"}, "down": {"uv": [0, 0, 16, 2], "texture": "#0"}}}, {"from": [0, 2, 6], "to": [16, 4, 7], "faces": {"north": {"uv": [16, 0, 0, 2], "texture": "#0"}, "east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}, {"from": [0, 2, 9], "to": [16, 4, 10], "faces": {"east": {"uv": [15, 0, 16, 2], "texture": "#0"}, "south": {"uv": [0, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, "down": {"uv": [0, 0, 16, 1], "texture": "#0"}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_base.json b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_base.json index 1e77cc3cc..7d0654bac 100644 --- a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_base.json +++ b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_base.json @@ -1 +1,33 @@ -{"credit": "Made with Blockbench by Mc_Jeronimo", "texture_size": [32, 32], "textures": {"0": "opensignals:blocks/default/controlbox", "particle": "opensignals:blocks/default/controlbox"}, "elements": [{"from": [3, 0, 5], "to": [13, 16, 11], "faces": {"north": {"uv": [0, 0, 5, 8], "texture": "#0"}, "east": {"uv": [0, 0, 3, 8], "texture": "#0"}, "south": {"uv": [0, 0, 5, 8], "texture": "#0"}, "west": {"uv": [0, 0, 3, 8], "texture": "#0"}, "down": {"uv": [0, 0, 5, 3], "texture": "#0"}}}]} \ No newline at end of file +{ + "credit": "Made with Blockbench by Mc_Jeronimo", + "texture_size": [32, 32], + "textures": { + "0": "opensignals:blocks/default/controlbox", + "particle": "opensignals:blocks/default/controlbox" + }, + "elements": [ + { + "from": [3, 0, 5], + "to": [13, 16, 11], + "faces": { + "north": {"uv": [0, 0, 5, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 5, 3], "texture": "#0"} + } + }, + { + "from": [3, 16, 5], + "to": [13, 22, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [0, 0, 5, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 5, 3], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_base_top.json b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_base_top.json index dbb03be13..5e4bd9433 100644 --- a/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_base_top.json +++ b/src/main/resources/assets/opensignals/models/block/railroad_gate/barrier_base_top.json @@ -1 +1,100 @@ -{"credit": "Made with Blockbench by Mc_Jeronimo", "texture_size": [32, 32], "textures": {"0": "opensignals:blocks/default/controlbox", "1": "opensignals:blocks/default/shield_black", "2": "opensignals:blocks/default/shield_gray", "particle": "opensignals:blocks/default/controlbox"}, "elements": [{"from": [3, 0, 5], "to": [13, 6, 11], "faces": {"north": {"uv": [0, 0, 5, 8], "texture": "#0"}, "east": {"uv": [0, 0, 3, 8], "texture": "#0"}, "south": {"uv": [0, 0, 5, 8], "texture": "#0"}, "west": {"uv": [0, 0, 3, 8], "texture": "#0"}, "up": {"uv": [0, 0, 5, 3], "texture": "#0"}}}, {"from": [17, 1, 6], "to": [18, 5, 10], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, "faces": {"north": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "east": {"uv": [0, 0, 2, 2], "texture": "#1"}, "south": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "west": {"uv": [0, 0, 2, 2], "texture": "#1"}, "up": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "down": {"uv": [0, 0, 0.5, 2], "texture": "#1"}}}, {"from": [15, 1, 5], "to": [17, 5, 6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, "faces": {"north": {"uv": [0, 0, 1, 2], "texture": "#1"}, "east": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "south": {"uv": [0, 0, 1, 2], "texture": "#1"}, "west": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "up": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, "down": {"uv": [0, 0, 1, 0.5], "texture": "#1"}}}, {"from": [6, 1, 4], "to": [15, 5, 5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, "faces": {"north": {"uv": [0, 0, 4.5, 2], "texture": "#1"}, "east": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "south": {"uv": [0, 0, 4.5, 2], "texture": "#1"}, "up": {"uv": [0, 0, 4.5, 0.5], "texture": "#1"}, "down": {"uv": [0, 0, 4.5, 0.5], "texture": "#1"}}}, {"from": [-3, 1, 2], "to": [6, 5, 5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, "faces": {"north": {"uv": [0, 0, 4.5, 2], "texture": "#2"}, "east": {"uv": [0, 0, 1.5, 2], "texture": "#2"}, "south": {"uv": [0, 0, 4.5, 2], "texture": "#2"}, "west": {"uv": [0, 0, 1.5, 2], "texture": "#2"}, "up": {"uv": [0, 0, 4.5, 1.5], "texture": "#2"}, "down": {"uv": [0, 0, 4.5, 1.5], "texture": "#2"}}}, {"from": [-3, 1, 11], "to": [6, 5, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, "faces": {"north": {"uv": [0, 0, 4.5, 2], "texture": "#2"}, "east": {"uv": [0, 0, 1.5, 2], "texture": "#2"}, "south": {"uv": [0, 0, 4.5, 2], "texture": "#2"}, "west": {"uv": [0, 0, 1.5, 2], "texture": "#2"}, "up": {"uv": [0, 0, 4.5, 1.5], "texture": "#2"}, "down": {"uv": [0, 0, 4.5, 1.5], "texture": "#2"}}}, {"from": [6, 1, 11], "to": [15, 5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, "faces": {"north": {"uv": [0, 0, 4.5, 2], "texture": "#1"}, "east": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "south": {"uv": [0, 0, 4.5, 2], "texture": "#1"}, "up": {"uv": [0, 0, 4.5, 0.5], "texture": "#1"}, "down": {"uv": [0, 0, 4.5, 0.5], "texture": "#1"}}}, {"from": [15, 1, 10], "to": [17, 5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, "faces": {"north": {"uv": [0, 0, 1, 2], "texture": "#1"}, "east": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "south": {"uv": [0, 0, 1, 2], "texture": "#1"}, "west": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, "up": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, "down": {"uv": [0, 0, 1, 0.5], "texture": "#1"}}}]} \ No newline at end of file +{ + "credit": "Made with Blockbench by Mc_Jeronimo", + "texture_size": [32, 32], + "textures": { + "1": "opensignals:blocks/default/shield_black", + "2": "opensignals:blocks/default/shield_gray", + "particle": "opensignals:blocks/default/shield_black" + }, + "elements": [ + { + "from": [17, 1, 6], + "to": [18, 5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "down": {"uv": [0, 0, 0.5, 2], "texture": "#1"} + } + }, + { + "from": [15, 1, 5], + "to": [17, 5, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#1"} + } + }, + { + "from": [6, 1, 4], + "to": [15, 5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 4.5, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 4.5, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 4.5, 0.5], "texture": "#1"}, + "down": {"uv": [0, 0, 4.5, 0.5], "texture": "#1"} + } + }, + { + "from": [-3, 1, 2], + "to": [6, 5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 4.5, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 1.5, 2], "texture": "#2"}, + "south": {"uv": [0, 0, 4.5, 2], "texture": "#2"}, + "west": {"uv": [0, 0, 1.5, 2], "texture": "#2"}, + "up": {"uv": [0, 0, 4.5, 1.5], "texture": "#2"}, + "down": {"uv": [0, 0, 4.5, 1.5], "texture": "#2"} + } + }, + { + "from": [-3, 1, 11], + "to": [6, 5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 4.5, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 1.5, 2], "texture": "#2"}, + "south": {"uv": [0, 0, 4.5, 2], "texture": "#2"}, + "west": {"uv": [0, 0, 1.5, 2], "texture": "#2"}, + "up": {"uv": [0, 0, 4.5, 1.5], "texture": "#2"}, + "down": {"uv": [0, 0, 4.5, 1.5], "texture": "#2"} + } + }, + { + "from": [6, 1, 11], + "to": [15, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 4.5, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 4.5, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 4.5, 0.5], "texture": "#1"}, + "down": {"uv": [0, 0, 4.5, 0.5], "texture": "#1"} + } + }, + { + "from": [15, 1, 10], + "to": [17, 5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/semaphore_signals/sema_main_wing1_small.json b/src/main/resources/assets/opensignals/models/block/semaphore_signals/sema_main_wing1_small.json new file mode 100644 index 000000000..121a896e5 --- /dev/null +++ b/src/main/resources/assets/opensignals/models/block/semaphore_signals/sema_main_wing1_small.json @@ -0,0 +1 @@ +{"credit": "Made with Blockbench by Mc_Jeronimo", "texture_size": [32, 32], "textures": {"1": "opensignals:blocks/default/shield_black", "4": "opensignals:blocks/semaphore/semaphore", "8": "opensignals:blocks/semaphore/semaphore_lamps1_red"}, "elements": [{"name": "wing1", "from": [-14, 7, 3.5], "to": [18, 11, 4.5], "faces": {"north": {"uv": [0, 0.5, 16, 2.5], "texture": "#4"}, "east": {"uv": [0, 6.5, 0.5, 8.5], "texture": "#4"}, "south": {"uv": [0, 3.5, 16, 5.5], "rotation": 180, "texture": "#4"}, "west": {"uv": [15.5, 6.5, 16, 8.5], "texture": "#4"}, "up": {"uv": [0, 6, 16, 6.5], "texture": "#4"}, "down": {"uv": [0, 8.5, 16, 9], "texture": "#4"}}}, {"name": "wing1", "from": [-13, 11, 3.5], "to": [-9, 12, 4.5], "faces": {"north": {"uv": [13.5, 0, 15.5, 0.5], "texture": "#4"}, "east": {"uv": [11.5, 9.5, 12, 10], "texture": "#4"}, "south": {"uv": [13.5, 3, 15.5, 3.5], "texture": "#4"}, "west": {"uv": [11.5, 9.5, 12, 10], "texture": "#4"}, "up": {"uv": [12.5, 9.5, 14.5, 10], "texture": "#4"}}}, {"name": "wing1", "from": [-13, 6, 3.5], "to": [-9, 7, 4.5], "faces": {"north": {"uv": [13.5, 2.5, 15.5, 3], "texture": "#4"}, "east": {"uv": [11.5, 9.5, 12, 10], "texture": "#4"}, "south": {"uv": [13.5, 5.5, 15.5, 6], "texture": "#4"}, "west": {"uv": [11.5, 9.5, 12, 10], "texture": "#4"}, "down": {"uv": [12.5, 9.5, 14.5, 10], "texture": "#4"}}}, {"name": "shield", "from": [-3.6434, 0.06802, 4.5], "to": [6.3566, 6.06802, 5.5], "rotation": {"angle": -45, "axis": "z", "origin": [0, 0, 0]}, "faces": {"north": {"uv": [0, 0, 10, 6], "texture": "#8"}, "east": {"uv": [0, 0, 3, 0.5], "rotation": 270, "texture": "#1"}, "south": {"uv": [0, 0, 3, 5], "rotation": 270, "texture": "#1"}, "west": {"uv": [0, 0, 3, 0.5], "rotation": 270, "texture": "#1"}, "up": {"uv": [0, 0, 0.5, 5], "rotation": 270, "texture": "#1"}, "down": {"uv": [0, 0, 0.5, 5], "rotation": 270, "texture": "#1"}}}], "groups": [{"name": "Formsignal_Haupt", "origin": [0, -112, 0], "color": 0, "children": [{"name": "wing1", "origin": [0, 9, -5.5], "color": 0, "children": [0, 1, 2, {"name": "lamp1", "origin": [-1, 8, -5.5], "color": 0, "children": [3]}]}]}]} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/models/block/semaphore_signals/sema_main_wing2_small.json b/src/main/resources/assets/opensignals/models/block/semaphore_signals/sema_main_wing2_small.json new file mode 100644 index 000000000..5d9c6552a --- /dev/null +++ b/src/main/resources/assets/opensignals/models/block/semaphore_signals/sema_main_wing2_small.json @@ -0,0 +1 @@ +{"credit": "Made with Blockbench by Mc_Jeronimo", "texture_size": [32, 32], "textures": {"1": "opensignals:blocks/default/shield_black", "4": "opensignals:blocks/semaphore/semaphore", "9": "opensignals:blocks/semaphore/semaphore_lamps2_dark"}, "elements": [{"name": "wing2", "from": [9, 0, 3.5], "to": [13, 32, 4.5], "faces": {"north": {"uv": [0, 0.5, 16, 2.5], "rotation": 270, "texture": "#4"}, "east": {"uv": [0, 6, 16, 6.5], "rotation": 90, "texture": "#4"}, "south": {"uv": [0, 3.5, 16, 5.5], "rotation": 270, "texture": "#4"}, "west": {"uv": [0, 8.5, 16, 9], "rotation": 90, "texture": "#4"}, "up": {"uv": [15.5, 6.5, 16, 8.5], "rotation": 90, "texture": "#4"}, "down": {"uv": [0, 6.5, 0.5, 8.5], "rotation": 90, "texture": "#4"}}}, {"name": "wing2", "from": [13, 27, 3.5], "to": [14, 31, 4.5], "faces": {"north": {"uv": [13.5, 0, 15.5, 0.5], "rotation": 270, "texture": "#4"}, "east": {"uv": [12.5, 9.5, 14.5, 10], "rotation": 90, "texture": "#4"}, "south": {"uv": [13.5, 3, 15.5, 3.5], "rotation": 90, "texture": "#4"}, "up": {"uv": [11.5, 9.5, 12, 10], "rotation": 90, "texture": "#4"}, "down": {"uv": [11.5, 9.5, 12, 10], "rotation": 90, "texture": "#4"}}}, {"name": "wing2", "from": [8, 27, 3.5], "to": [9, 31, 4.5], "faces": {"north": {"uv": [13.5, 2.5, 15.5, 3], "rotation": 270, "texture": "#4"}, "south": {"uv": [13.5, 5.5, 15.5, 6], "rotation": 90, "texture": "#4"}, "west": {"uv": [12.5, 9.5, 14.5, 10], "rotation": 90, "texture": "#4"}, "up": {"uv": [11.5, 9.5, 12, 10], "rotation": 90, "texture": "#4"}, "down": {"uv": [11.5, 9.5, 12, 10], "rotation": 90, "texture": "#4"}}}, {"name": "shield", "from": [-4.42893, 0.32233, 4.5], "to": [5.57107, 6.32233, 5.5], "rotation": {"angle": -45, "axis": "z", "origin": [0, 0, 0]}, "faces": {"north": {"uv": [0, 0, 10, 6], "texture": "#9"}, "east": {"uv": [0, 0, 3, 0.5], "rotation": 270, "texture": "#1"}, "south": {"uv": [0, 0, 3, 5], "rotation": 270, "texture": "#1"}, "west": {"uv": [0, 0, 3, 0.5], "rotation": 270, "texture": "#1"}, "up": {"uv": [0, 0, 0.5, 5], "rotation": 270, "texture": "#1"}, "down": {"uv": [0, 0, 0.5, 5], "rotation": 270, "texture": "#1"}}}], "groups": [{"name": "Formsignal_Haupt", "origin": [0, -80, 0], "color": 0, "children": [{"name": "wing2", "origin": [0, 11.5, -3.5], "color": 0, "children": [0, 1, 2, 3]}]}]} \ No newline at end of file diff --git a/src/main/resources/assets/opensignals/signalsystems/railroadgateanimated.json b/src/main/resources/assets/opensignals/signalsystems/railroadgateanimated.json deleted file mode 100644 index 83080e716..000000000 --- a/src/main/resources/assets/opensignals/signalsystems/railroadgateanimated.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "systemProperties": { - "placementToolName": "signplacementtool", - "canLink": true, - "defaultHeight": 1 - }, - "seProperties": [ - { - "name": "barrier_length", - "enumClass": "RailroadGateLength", - "defaultState": "L1", - "autoname": true, - "changeableStage": "GUISTAGE" - }, - { - "name": "barrier_open", - "defaultState": false, - "changeableStage": "APISTAGE_NONE_CONFIG", - "autoname": true - } - ] -} \ No newline at end of file