From 6c20fa69bfefb39eda36f8aa3f39b1a880f0606f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 18 Jun 2020 16:13:47 +0100 Subject: [PATCH] Fix #2137 --- .../models/block/machines/lighting/alarm.json | 3 +- .../block/machines/lighting/alarm_on.json | 77 ++++++++++--------- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/src/main/resources/assets/techreborn/models/block/machines/lighting/alarm.json b/src/main/resources/assets/techreborn/models/block/machines/lighting/alarm.json index 5a4542a7e..59c0d5d51 100644 --- a/src/main/resources/assets/techreborn/models/block/machines/lighting/alarm.json +++ b/src/main/resources/assets/techreborn/models/block/machines/lighting/alarm.json @@ -18,7 +18,8 @@ } }, "textures": { - "0": "techreborn:block/machines/lighting/alarm_off" + "0": "techreborn:block/machines/lighting/alarm_off", + "particle": "techreborn:block/machines/lighting/alarm_off" }, "elements": [ { diff --git a/src/main/resources/assets/techreborn/models/block/machines/lighting/alarm_on.json b/src/main/resources/assets/techreborn/models/block/machines/lighting/alarm_on.json index 3588f0343..1af1dc22b 100644 --- a/src/main/resources/assets/techreborn/models/block/machines/lighting/alarm_on.json +++ b/src/main/resources/assets/techreborn/models/block/machines/lighting/alarm_on.json @@ -1,38 +1,39 @@ -{ - "parent": "block/block", - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 2], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 35, 0 ], - "translation": [ 0, 5.5, 0 ], - "scale": [ 0.60, 0.60, 0.60 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 225, 0 ], - "translation": [ 0, 4.2, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "0": "techreborn:block/machines/lighting/alarm_on" - }, - "elements": [ - { - "name": "Alarm", - "from": [3, 0, 3], - "to": [13, 3, 13], - "faces": { - "down": { "texture": "#0", "uv": [0.0, 0.0, 1.0, 1.0] }, - "up": { "texture": "#0", "uv": [1.0,1.0,15.0,15.0] }, - "north": { "texture": "#0", "uv": [1.0,2.0,15.0,0.0] }, - "south": { "texture": "#0", "uv": [1.0,2.0,15.0,0.0] }, - "west": { "texture": "#0", "uv": [1.0,2.0,15.0,0.0] }, - "east": { "texture": "#0", "uv": [1.0,2.0,15.0,0.0] } - } - } - ] -} +{ + "parent": "block/block", + "display": { + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 2], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 35, 0 ], + "translation": [ 0, 5.5, 0 ], + "scale": [ 0.60, 0.60, 0.60 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 4.2, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + }, + "textures": { + "0": "techreborn:block/machines/lighting/alarm_on", + "particle": "techreborn:block/machines/lighting/alarm_on" + }, + "elements": [ + { + "name": "Alarm", + "from": [3, 0, 3], + "to": [13, 3, 13], + "faces": { + "down": { "texture": "#0", "uv": [0.0, 0.0, 1.0, 1.0] }, + "up": { "texture": "#0", "uv": [1.0,1.0,15.0,15.0] }, + "north": { "texture": "#0", "uv": [1.0,2.0,15.0,0.0] }, + "south": { "texture": "#0", "uv": [1.0,2.0,15.0,0.0] }, + "west": { "texture": "#0", "uv": [1.0,2.0,15.0,0.0] }, + "east": { "texture": "#0", "uv": [1.0,2.0,15.0,0.0] } + } + } + ] +}